diff options
| author | Bill Wendling <isanbard@gmail.com> | 2010-03-23 22:15:33 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2010-03-23 22:15:33 +0000 |
| commit | 602d0050832d5969e15301b6fca2c5a488e32eac (patch) | |
| tree | de3edff691bb3103a9e233d081a11540b77b8aa1 | |
| parent | 349074896f17cdebf484f6be97248c6545ecf93b (diff) | |
| download | llvm-602d0050832d5969e15301b6fca2c5a488e32eac.tar.gz llvm-602d0050832d5969e15301b6fca2c5a488e32eac.tar.bz2 llvm-602d0050832d5969e15301b6fca2c5a488e32eac.tar.xz | |
Use "DISABLE_EDIS" to disable building "edis" explicitly. Don't build it for
Apple-style builds.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99336 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | tools/Makefile | 8 | ||||
| -rwxr-xr-x | utils/buildit/build_llvm | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile index 58130570d7..0c9a9644a5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -22,7 +22,6 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \ lli llvm-extract \ bugpoint llvm-bcanalyzer llvm-stub \ llvm-mc llvmc - # Let users override the set of tools to build from the command line. ifdef ONLY_TOOLS @@ -38,7 +37,7 @@ ifeq ($(ENABLE_PIC),1) # No support for dynamic libraries on windows targets. ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW)) PARALLEL_DIRS += edis - + # gold only builds if binutils is around. It requires "lto" to build before # it so it is added to DIRS. ifdef BINUTILS_INCDIR @@ -54,4 +53,9 @@ ifeq ($(filter $(TARGETS_TO_BUILD), X86),) PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS)) endif +# Don't build edis if we explicitly disabled it. +ifneq ($(DISABLE_EDIS),1) + PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS)) +endif + include $(LEVEL)/Makefile.common diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm index f67794e4fa..33f471db4f 100755 --- a/utils/buildit/build_llvm +++ b/utils/buildit/build_llvm @@ -203,6 +203,7 @@ fi make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \ UNIVERSAL_SDK_PATH=$HOST_SDKROOT \ NO_RUNTIME_LIBS=1 \ + DISABLE_EDIS=1 \ LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \ LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \ CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" \ @@ -227,6 +228,7 @@ cd $DIR/obj-llvm || exit 1 # Install the tree into the destination directory. make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \ NO_RUNTIME_LIBS=1 \ + DISABLE_EDIS=1 \ LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \ LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \ OPTIMIZE_OPTION='-O3' VERBOSE=1 install |