mirror of
https://github.com/capstone-engine/llvm-capstone.git
synced 2024-10-10 04:44:53 +00:00
Use "DISABLE_EDIS" to disable building "edis" explicitly. Don't build it for
Apple-style builds. llvm-svn: 99336
This commit is contained in:
parent
42f8ddeb11
commit
c941619a73
@ -22,7 +22,6 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
|
|||||||
lli llvm-extract \
|
lli llvm-extract \
|
||||||
bugpoint llvm-bcanalyzer llvm-stub \
|
bugpoint llvm-bcanalyzer llvm-stub \
|
||||||
llvm-mc llvmc
|
llvm-mc llvmc
|
||||||
|
|
||||||
|
|
||||||
# Let users override the set of tools to build from the command line.
|
# Let users override the set of tools to build from the command line.
|
||||||
ifdef ONLY_TOOLS
|
ifdef ONLY_TOOLS
|
||||||
@ -38,7 +37,7 @@ ifeq ($(ENABLE_PIC),1)
|
|||||||
# No support for dynamic libraries on windows targets.
|
# No support for dynamic libraries on windows targets.
|
||||||
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
|
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
|
||||||
PARALLEL_DIRS += edis
|
PARALLEL_DIRS += edis
|
||||||
|
|
||||||
# gold only builds if binutils is around. It requires "lto" to build before
|
# gold only builds if binutils is around. It requires "lto" to build before
|
||||||
# it so it is added to DIRS.
|
# it so it is added to DIRS.
|
||||||
ifdef BINUTILS_INCDIR
|
ifdef BINUTILS_INCDIR
|
||||||
@ -54,4 +53,9 @@ ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
|
|||||||
PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
|
PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
|
||||||
endif
|
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
|
include $(LEVEL)/Makefile.common
|
||||||
|
@ -203,6 +203,7 @@ fi
|
|||||||
make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
|
make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
|
||||||
UNIVERSAL_SDK_PATH=$HOST_SDKROOT \
|
UNIVERSAL_SDK_PATH=$HOST_SDKROOT \
|
||||||
NO_RUNTIME_LIBS=1 \
|
NO_RUNTIME_LIBS=1 \
|
||||||
|
DISABLE_EDIS=1 \
|
||||||
LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
|
LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
|
||||||
LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
|
LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
|
||||||
CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" \
|
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.
|
# Install the tree into the destination directory.
|
||||||
make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
|
make $LOCAL_MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \
|
||||||
NO_RUNTIME_LIBS=1 \
|
NO_RUNTIME_LIBS=1 \
|
||||||
|
DISABLE_EDIS=1 \
|
||||||
LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
|
LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \
|
||||||
LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
|
LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \
|
||||||
OPTIMIZE_OPTION='-O3' VERBOSE=1 install
|
OPTIMIZE_OPTION='-O3' VERBOSE=1 install
|
||||||
|
Loading…
Reference in New Issue
Block a user