6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-21 02:24:22 +00:00
Code Issues Projects Releases Wiki Activity

Remove dead code for installing libLTO when building llvmCore.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153978 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bob Wilson
2012-04-03 23:13:26 +00:00
parent 93210e847a
commit d13af63df7
2 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/buildit/GNUmakefile
View File

@ -46,9 +46,6 @@ else
LLVM_OPTIMIZED := yes LLVM_OPTIMIZED := yes
endif endif
# Default to not install libLTO.dylib.
INSTALL_LIBLTO := no
# Default to do a native build, not a cross-build for an ARM host or simulator. # Default to do a native build, not a cross-build for an ARM host or simulator.
ARM_HOSTED_BUILD := no ARM_HOSTED_BUILD := no
IOS_SIM_BUILD := no IOS_SIM_BUILD := no
@ -66,7 +63,7 @@ install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
cd $(OBJROOT) && \ cd $(OBJROOT) && \
$(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \ $(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
$(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \ $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
$(ENABLE_ASSERTIONS) $(LLVM_OPTIMIZED) $(INSTALL_LIBLTO) \ $(ENABLE_ASSERTIONS) $(LLVM_OPTIMIZED) \
$(ARM_HOSTED_BUILD) $(IOS_SIM_BUILD) \ $(ARM_HOSTED_BUILD) $(IOS_SIM_BUILD) \
$(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion)

39
utils/buildit/build_llvm
View File

@ -42,21 +42,17 @@ LLVM_ASSERTIONS="$7"
# build. # build.
LLVM_OPTIMIZED="$8" LLVM_OPTIMIZED="$8"
# The ninth parameter is a yes/no that indicates whether libLTO.dylib
# should be installed.
INSTALL_LIBLTO="$9"
# A yes/no parameter that controls whether to cross-build for an ARM host. # A yes/no parameter that controls whether to cross-build for an ARM host.
ARM_HOSTED_BUILD="${10}" ARM_HOSTED_BUILD="$9"
# A yes/no parameter that controls whether to cross-build for the iOS simulator # A yes/no parameter that controls whether to cross-build for the iOS simulator
IOS_SIM_BUILD="${11}" IOS_SIM_BUILD="${10}"
# The version number of the submission, e.g. 1007. # The version number of the submission, e.g. 1007.
LLVM_SUBMIT_VERSION="${12}" LLVM_SUBMIT_VERSION="${11}"
# The subversion number of the submission, e.g. 03. # The subversion number of the submission, e.g. 03.
LLVM_SUBMIT_SUBVERSION="${13}" LLVM_SUBMIT_SUBVERSION="${12}"
# The current working directory is where the build will happen. It may already # The current working directory is where the build will happen. It may already
# contain a partial result of an interrupted build, in which case this script # contain a partial result of an interrupted build, in which case this script
@ -297,34 +293,11 @@ find obj-* -name \*.\[chy\] -o -name \*.cpp -print \
| cpio -pdml $SYM_DIR/src || exit 1 | cpio -pdml $SYM_DIR/src || exit 1
################################################################################ ################################################################################
# Install and strip libLTO.dylib # Remove libLTO.dylib and lto.h. Those are installed by clang.
cd $DEST_DIR$DEST_ROOT cd $DEST_DIR$DEST_ROOT
if [ "$INSTALL_LIBLTO" = "yes" ]; then rm -f lib/libLTO.dylib
DT_HOME="$DEST_DIR/Developer/usr"
mkdir -p $DT_HOME/lib
mv lib/libLTO.dylib $DT_HOME/lib/libLTO.dylib
# Save a copy of the unstripped dylib
mkdir -p $SYM_DIR/Developer/usr/lib
cp $DT_HOME/lib/libLTO.dylib $SYM_DIR/Developer/usr/lib/libLTO.dylib
# Use '-l' to strip i386 modules. N.B. that flag doesn't work with kext or
# PPC objects!
$STRIP -arch all -Sl $DT_HOME/lib/libLTO.dylib
if [ "x$DISABLE_USR_LINKS" == "x" ]; then
# 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
else
rm -f lib/libLTO.dylib
fi
rm -f lib/libLTO.a lib/libLTO.la rm -f lib/libLTO.a lib/libLTO.la
# Omit lto.h from the result. Clang will supply.
find $DEST_DIR$DEST_ROOT -name lto.h -delete find $DEST_DIR$DEST_ROOT -name lto.h -delete
################################################################################ ################################################################################