aboutsummaryrefslogtreecommitdiffstats
path: root/utils/buildit
diff options
context:
space:
mode:
Diffstat (limited to 'utils/buildit')
-rw-r--r--utils/buildit/GNUmakefile2
-rwxr-xr-xutils/buildit/build_llvm4
2 files changed, 5 insertions, 1 deletions
diff --git a/utils/buildit/GNUmakefile b/utils/buildit/GNUmakefile
index e3b334a..9971883 100644
--- a/utils/buildit/GNUmakefile
+++ b/utils/buildit/GNUmakefile
@@ -59,7 +59,7 @@ endif
# NOTE : Always put version numbers at the end because they are optional.
install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
cd $(OBJROOT) && \
- $(SRC)/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
+ $(SRC)/utils/buildit/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
$(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
$(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED) \
$(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion)
diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm
index 91fbe15..2bdb2082 100755
--- a/utils/buildit/build_llvm
+++ b/utils/buildit/build_llvm
@@ -82,6 +82,10 @@ 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