Author: kledzik
Date: Tue May 24 15:27:31 2011
New Revision: 131996
URL: http://llvm.org/viewvc/llvm-project?rev=131996&view=rev
Log:
support another Apple build environment
Modified:
libcxx/trunk/Makefile
libcxx/trunk/lib/buildit
Modified: libcxx/trunk/Makefile
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/Makefile?rev=131996&r1=131995&r2=131996&view=diff
==============================================================================
--- libcxx/trunk/Makefile (original)
+++ libcxx/trunk/Makefile Tue May 24 15:27:31 2011
@@ -9,6 +9,12 @@
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 @@
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
Modified: libcxx/trunk/lib/buildit
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/buildit?rev=131996&r1=131995&r2=131996&view=diff
==============================================================================
--- libcxx/trunk/lib/buildit (original)
+++ libcxx/trunk/lib/buildit Tue May 24 15:27:31 2011
@@ -24,7 +24,10 @@
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 @@
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
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
