Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MacOS: do not build in Universal format by default

This commit is contained in:
Nguyen Anh Quynh 2018-07-28 00:24:14 +08:00
parent 2fc852dcbd
commit 44bcb2fa38
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -270,8 +270,8 @@ VERSION_EXT =
IS_APPLE := $(shell $(CC) -dM -E - < /dev/null 2> /dev/null | grep __apple_build_version__ | wc -l | tr -d " ") IS_APPLE := $(shell $(CC) -dM -E - < /dev/null 2> /dev/null | grep __apple_build_version__ | wc -l | tr -d " ")
ifeq ($(IS_APPLE),1) ifeq ($(IS_APPLE),1)
# on MacOS, compile in Universal format by default # on MacOS, do not build in Universal format by default
MACOS_UNIVERSAL ?= yes MACOS_UNIVERSAL ?= no
ifeq ($(MACOS_UNIVERSAL),yes) ifeq ($(MACOS_UNIVERSAL),yes)
CFLAGS += $(foreach arch,$(LIBARCHS),-arch $(arch)) CFLAGS += $(foreach arch,$(LIBARCHS),-arch $(arch))
LDFLAGS += $(foreach arch,$(LIBARCHS),-arch $(arch)) LDFLAGS += $(foreach arch,$(LIBARCHS),-arch $(arch))

1
make.sh
View File

@ -129,6 +129,7 @@ case "$TARGET" in
"ios_armv7s" ) build_iOS armv7s $*;; "ios_armv7s" ) build_iOS armv7s $*;;
"ios_arm64" ) build_iOS arm64 $*;; "ios_arm64" ) build_iOS arm64 $*;;
"osx-kernel" ) CAPSTONE_USE_SYS_DYN_MEM=yes CAPSTONE_HAS_OSXKERNEL=yes CAPSTONE_ARCHS=x86 CAPSTONE_SHARED=no CAPSTONE_BUILD_CORE_ONLY=yes ${MAKE} $*;; "osx-kernel" ) CAPSTONE_USE_SYS_DYN_MEM=yes CAPSTONE_HAS_OSXKERNEL=yes CAPSTONE_ARCHS=x86 CAPSTONE_SHARED=no CAPSTONE_BUILD_CORE_ONLY=yes ${MAKE} $*;;
"mac-universal" ) MACOS_UNIVERSAL=yes ${MAKE} $*;;
"mac-universal-no" ) MACOS_UNIVERSAL=no ${MAKE} $*;; "mac-universal-no" ) MACOS_UNIVERSAL=no ${MAKE} $*;;
* ) * )
echo "Usage: $0 ["`grep '^ "' $0 | cut -d '"' -f 2 | tr "\\n" "|"`"]" echo "Usage: $0 ["`grep '^ "' $0 | cut -d '"' -f 2 | tr "\\n" "|"`"]"