mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 03:02:36 +01:00
Revert "Tweak top-level Makefile to facilitate Apple-style build.", this is
breaking Clang's Apple-style build. llvm-svn: 84592
This commit is contained in:
parent
793dfbc945
commit
25f8a7e4fd
6
Makefile
6
Makefile
@ -19,7 +19,6 @@ LEVEL := .
|
||||
#
|
||||
# When cross-compiling, there are some things (tablegen) that need to
|
||||
# be build for the build system first.
|
||||
ifndef RC_ARCHS # Normal build (not "Apple-style").
|
||||
ifeq ($(BUILD_DIRS_ONLY),1)
|
||||
DIRS := lib/System lib/Support utils
|
||||
OPTIONAL_DIRS :=
|
||||
@ -212,8 +211,3 @@ happiness: update all check unittests
|
||||
|
||||
.NOTPARALLEL:
|
||||
|
||||
else # Building "Apple-style."
|
||||
# N.B. In an Apple-style build, once configuration is done, lines
|
||||
# marked "Apple-style" are removed with sed! See utils/buildit/build_llvm.
|
||||
include utils/buildit/GNUmakefile # Building "Apple-style."
|
||||
endif # Building "Apple-style."
|
||||
|
@ -59,7 +59,7 @@ endif
|
||||
# NOTE : Always put version numbers at the end because they are optional.
|
||||
install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
|
||||
cd $(OBJROOT) && \
|
||||
$(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
|
||||
$(SRC)/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
|
||||
$(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
|
||||
$(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED) \
|
||||
$(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion)
|
||||
|
@ -82,10 +82,6 @@ SRC_DIR=$DIR/src
|
||||
rm -rf $SRC_DIR || exit 1
|
||||
mkdir $SRC_DIR || exit 1
|
||||
ln -s $ORIG_SRC_DIR/* $SRC_DIR/ || exit 1
|
||||
# We can't use the top-level Makefile as-is. Remove the soft link:
|
||||
rm $SRC_DIR/Makefile || exit 1
|
||||
# Now create our own by editing the top-level Makefile, deleting every line marked "Apple-style":
|
||||
sed -e '/[Aa]pple-style/d' -e '/include.*GNUmakefile/d' $ORIG_SRC_DIR/Makefile > $SRC_DIR/Makefile || exit 1
|
||||
|
||||
# Build the LLVM tree universal.
|
||||
mkdir -p $DIR/obj-llvm || exit 1
|
||||
|
Loading…
Reference in New Issue
Block a user