diff options
| author | Nick Kledzik <kledzik@apple.com> | 2011-05-24 20:27:31 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2011-05-24 20:27:31 +0000 |
| commit | bc6191fba91ded9787eec37e81e3afb8fd63e985 (patch) | |
| tree | 54d28885b46395753277859f92bdf764954e8ffd | |
| parent | 664c0da5d8fcf0585f5f3be78cd19795db67ef68 (diff) | |
| download | llvm-bc6191fba91ded9787eec37e81e3afb8fd63e985.zip llvm-bc6191fba91ded9787eec37e81e3afb8fd63e985.tar.gz llvm-bc6191fba91ded9787eec37e81e3afb8fd63e985.tar.bz2 | |
support another Apple build environment
llvm-svn: 131996
| -rw-r--r-- | libcxx/Makefile | 26 | ||||
| -rwxr-xr-x | libcxx/lib/buildit | 10 |
2 files changed, 24 insertions, 12 deletions
diff --git a/libcxx/Makefile b/libcxx/Makefile index 5a7118e..62d1bb3 100644 --- a/libcxx/Makefile +++ b/libcxx/Makefile @@ -9,6 +9,12 @@ OBJROOT=. SYMROOT=. export TRIPLE=-apple- +ifeq (,$(RC_INDIGO)) + INSTALL_PREFIX="" +else + INSTALL_PREFIX="$(SDKROOT)" +endif + installsrc:: $(SRCROOT) ditto $(SRCDIRS)/include $(SRCROOT)/include @@ -20,19 +26,19 @@ clean:: installhdrs:: - mkdir -p $(DSTROOT)/usr/include/c++/v1/ext - rsync -r --exclude=".*" $(SRCDIRS)/include/* $(DSTROOT)/usr/include/c++/v1/ - chown -R root:wheel $(DSTROOT)/usr/include - chmod 755 $(DSTROOT)/usr/include/c++/v1 - chmod 644 $(DSTROOT)/usr/include/c++/v1/* - chmod 755 $(DSTROOT)/usr/include/c++/v1/ext - chmod 644 $(DSTROOT)/usr/include/c++/v1/ext/* + mkdir -p $(DSTROOT)/$(INSTALL_PREFIX)/usr/include/c++/v1/ext + rsync -r --exclude=".*" $(SRCDIRS)/include/* $(DSTROOT)/$(INSTALL_PREFIX)/usr/include/c++/v1/ + chown -R root:wheel $(DSTROOT)/$(INSTALL_PREFIX)/usr/include + chmod 755 $(DSTROOT)/$(INSTALL_PREFIX)/usr/include/c++/v1 + chmod 644 $(DSTROOT)/$(INSTALL_PREFIX)/usr/include/c++/v1/* + chmod 755 $(DSTROOT)/$(INSTALL_PREFIX)/usr/include/c++/v1/ext + chmod 644 $(DSTROOT)/$(INSTALL_PREFIX)/usr/include/c++/v1/ext/* install:: installhdrs $(DESTDIR) cd lib && ./buildit ditto lib/libc++.1.dylib $(SYMROOT)/usr/lib/libc++.1.dylib cd lib && dsymutil -o $(SYMROOT)/libc++.1.dylib.dSYM $(SYMROOT)/usr/lib/libc++.1.dylib - mkdir -p $(DSTROOT)/usr/lib - strip -S -o $(DSTROOT)/usr/lib/libc++.1.dylib $(SYMROOT)/usr/lib/libc++.1.dylib - cd $(DSTROOT)/usr/lib && ln -s libc++.1.dylib libc++.dylib + mkdir -p $(DSTROOT)/$(INSTALL_PREFIX)/usr/lib + strip -S -o $(DSTROOT)/$(INSTALL_PREFIX)/usr/lib/libc++.1.dylib $(SYMROOT)/usr/lib/libc++.1.dylib + cd $(DSTROOT)/$(INSTALL_PREFIX)/usr/lib && ln -s libc++.1.dylib libc++.dylib diff --git a/libcxx/lib/buildit b/libcxx/lib/buildit index 291c363..643339a 100755 --- a/libcxx/lib/buildit +++ b/libcxx/lib/buildit @@ -24,7 +24,10 @@ fi if [ -z $MACOSX_DEPLOYMENT_TARGET ] then - MACOSX_DEPLOYMENT_TARGET=10.6 + if [ -z $IPHONEOS_DEPLOYMENT_TARGET ] + then + MACOSX_DEPLOYMENT_TARGET=10.6 + fi fi if [ -z $RC_ProjectSourceVersion ] @@ -55,7 +58,10 @@ case $TRIPLE in if [ -n "$SDKROOT" ] then EXTRA_FLAGS+="-isysroot ${SDKROOT}" - RE_EXPORT_FILE="libc++sjlj-abi.exp" + if [ "${RC_armv7}" = "YES" ] + then + RE_EXPORT_FILE="libc++sjlj-abi.exp" + fi CXX=`xcrun -sdk "${SDKROOT}" -find clang++` CC=`xcrun -sdk "${SDKROOT}" -find clang` fi |