[llvm-branch-commits] [llvm-gcc-branch] r102541 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ GNUmakefile build_gcc
Bob Wilson
bob.wilson at apple.com
Wed Apr 28 15:12:50 PDT 2010
Author: bwilson
Date: Wed Apr 28 17:12:50 2010
New Revision: 102541
URL: http://llvm.org/viewvc/llvm-project?rev=102541&view=rev
Log:
--- Merging r102506 into '.':
U GNUmakefile
--- Merging r102507 into '.':
G GNUmakefile
--- Merging r102511 into '.':
G GNUmakefile
U build_gcc
--- Merging r102532 into '.':
G GNUmakefile
G build_gcc
Modified:
llvm-gcc-4.2/branches/Apple/Morbo/ (props changed)
llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile
llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 28 17:12:50 2010
@@ -1,2 +1,2 @@
/llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532
Modified: llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile?rev=102541&r1=102540&r2=102541&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/GNUmakefile Wed Apr 28 17:12:50 2010
@@ -47,22 +47,19 @@
#######################################################################
# LLVM LOCAL begin
-# LLVM defaults to enabled.
-ifndef DISABLE_LLVM
-ENABLE_LLVM = true
# LLVM gets installed into /Developer/usr/local, not /usr.
ifndef DEVELOPER_DIR
PREFIX = /Developer/usr/llvm-gcc-4.2
else
PREFIX = ${DEVELOPER_DIR}/usr/llvm-gcc-4.2
endif
-else
-ENABLE_LLVM = false
-endif
-# Unless assertions are forced on in the GMAKE command line, enable them.
+# Default to not reinstall libLTO.dylib.
+INSTALL_LIBLTO := no
+
+# Unless assertions are forced on in the GMAKE command line, disable them.
ifndef ENABLE_ASSERTIONS
-ENABLE_ASSERTIONS := yes
+ENABLE_ASSERTIONS := no
endif
ifndef LLVMCORE_PATH
@@ -73,6 +70,13 @@
endif
endif
+# Default is optimized build.
+ifeq ($(LLVM_DEBUG),1)
+LLVM_OPTIMIZED := no
+else
+LLVM_OPTIMIZED := yes
+endif
+
ifndef RC_ProjectSourceVersion
RC_ProjectSourceVersion = 9999
endif
@@ -81,10 +85,30 @@
RC_ProjectSourceSubversion = 00
endif
-install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
+install:
+ $(MAKE) OBJROOT=$(OBJROOT)/obj-llvmCore \
+ SYMROOT=$(OBJROOT)/sym-llvmCore \
+ DSTROOT=$(OBJROOT)/dst-llvmCore \
+ INSTALL_LIBLTO=yes install-llvmCore
+ $(MAKE) LLVMCORE_PATH=$(OBJROOT)/dst-llvmCore/Developer/usr/local \
+ INSTALL_LIBLTO=yes install-llvmgcc42
+
+install-llvmCore: $(OBJROOT) $(SYMROOT) $(DSTROOT)
+ if [ ! -d $(SRC)/llvmCore ]; then \
+ echo "Error: llvmCore source directory is missing"; \
+ exit 1; \
+ fi
+ cd $(OBJROOT) && \
+ DEVELOPER_DIR=Developer \
+ $(SRC)/llvmCore/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
+ $(SRC)/llvmCore /usr/local $(DSTROOT) $(SYMROOT) \
+ $(ENABLE_ASSERTIONS) $(LLVM_OPTIMIZED) $(INSTALL_LIBLTO) \
+ $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion)
+
+install-llvmgcc42: $(OBJROOT) $(SYMROOT) $(DSTROOT)
cd $(OBJROOT) && \
$(SRC)/build_gcc "$(RC_ARCHS)" "$(TARGETS)" \
- $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(ENABLE_LLVM) \
+ $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) $(INSTALL_LIBLTO) \
$(ENABLE_ASSERTIONS) $(LLVMCORE_PATH) \
$(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion)
@@ -108,10 +132,11 @@
fi
# LLVM LOCAL begin: Avoid verification error due to binaries in libjava.
rm -rf "$(SRCROOT)/libjava/"
- find -d "$(SRCROOT)" \( -type d -a -name CVS -o \
+ find -d "$(SRCROOT)" \( -type d -a -name .svn -o \
-type f -a -name .DS_Store -o \
-name \*~ -o -name .\#\* \) \
-exec rm -rf {} \;
+ rm -rf "$(SRCROOT)/llvmCore/test"
#######################################################################
Modified: llvm-gcc-4.2/branches/Apple/Morbo/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/build_gcc?rev=102541&r1=102540&r2=102541&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/build_gcc (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/build_gcc Wed Apr 28 17:12:50 2010
@@ -69,9 +69,9 @@
SYM_DIR="$6"
# LLVM LOCAL begin
-# The seventh parameter is true/false indicating whether LLVM should be enabled
-# or not.
-ENABLE_LLVM="$7"
+# The seventh parameter is a yes/no that indicates whether libLTO.dylib
+# should be installed from LLVMCORE_PATH.
+INSTALL_LIBLTO="$7"
# The eighth parameter is a yes/no that indicates whether assertions should be
# enabled in the LLVM libs/tools.
@@ -86,6 +86,8 @@
# The eleventh parameter is the subversion number of the submission, e.g. 03.
LLVM_SUBMIT_SUBVERSION="${11}"
+ENABLE_LLVM=true
+
# LLVM LOCAL end
# The current working directory is where the build will happen.
@@ -765,6 +767,22 @@
find $DEST_DIR -name "unwind.h" -print | xargs rm || exit 1
fi
+# Install libLTO.dylib
+if [ "$INSTALL_LIBLTO" == yes ]; then
+ if [ ! -r $LLVMCORE_PATH/Developer/usr/lib/libLTO.dylib ]; then
+ echo "Error: llvmCore installation is missing libLTO.dylib"
+ exit 1
+ fi
+ mkdir -p $DEST_DIR/Developer/usr/lib
+ cp $LLVMCORE_PATH/Developer/usr/lib/libLTO.dylib \
+ $DEST_DIR/Developer/usr/lib/libLTO.dylib
+
+ # Add a symlink in /usr/lib for B&I.
+ mkdir -p $DEST_DIR/usr/lib/
+ cd $DEST_DIR/usr/lib && \
+ ln -s ../../Developer/usr/lib/libLTO.dylib ./libLTO.dylib
+fi
+
# LLVM LOCAL end
find $DEST_DIR -name \*.dSYM -print | xargs rm -r || exit 1
More information about the llvm-branch-commits
mailing list