diff --git a/Makefile b/Makefile index 377d11080..26f09edef 100644 --- a/Makefile +++ b/Makefile @@ -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 " ") ifeq ($(IS_APPLE),1) -# on MacOS, compile in Universal format by default -MACOS_UNIVERSAL ?= yes +# on MacOS, do not build in Universal format by default +MACOS_UNIVERSAL ?= no ifeq ($(MACOS_UNIVERSAL),yes) CFLAGS += $(foreach arch,$(LIBARCHS),-arch $(arch)) LDFLAGS += $(foreach arch,$(LIBARCHS),-arch $(arch)) diff --git a/make.sh b/make.sh index a2f7c6f64..21c55d739 100755 --- a/make.sh +++ b/make.sh @@ -129,6 +129,7 @@ case "$TARGET" in "ios_armv7s" ) build_iOS armv7s $*;; "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} $*;; + "mac-universal" ) MACOS_UNIVERSAL=yes ${MAKE} $*;; "mac-universal-no" ) MACOS_UNIVERSAL=no ${MAKE} $*;; * ) echo "Usage: $0 ["`grep '^ "' $0 | cut -d '"' -f 2 | tr "\\n" "|"`"]"