diff --git a/.travis.yml b/.travis.yml index 6279ffa1..c52083dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: c sudo: false before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./install-cmocka-linux.sh; fi +env: + - PATH=$PATH:/usr/local/opt/binutils/bin script: - make && make -C bindings/go && make -C bindings/go test && make test compiler: @@ -82,4 +84,5 @@ addons: - libc6-dev-i386 - gcc-multilib homebrew: + update: true brewfile: true diff --git a/Makefile b/Makefile index 7d737827..715f7092 100644 --- a/Makefile +++ b/Makefile @@ -172,6 +172,8 @@ LIBRARY_SYMLINK = lib$(LIBNAME).$(EXT) endif endif +UNICORN_QEMU_FLAGS += --python=$(shell which python2 || which /usr/bin/python || which python) + ifeq ($(UNICORN_STATIC),yes) ifneq ($(filter MINGW%,$(UNAME_S)),) ARCHIVE = $(LIBNAME).$(AR_EXT) diff --git a/make.sh b/make.sh index 74b7da7c..3b876de0 100755 --- a/make.sh +++ b/make.sh @@ -19,10 +19,6 @@ OPTIONS: cross-win64 Cross-compile Windows 64-bit binary with MinGW cross-android_arm Cross-compile for Android Arm cross-android_arm64 Cross-compile for Android Arm64 - ios Cross-compile for all iOS devices (armv7 + armv7s + arm64) - ios_armv7 Cross-compile for iOS ArmV7 (iPod 4, iPad 1/2/3, iPhone4, iPhone4S) - ios_armv7s Cross-compile for iOS ArmV7s (iPad 4, iPhone 5C, iPad mini) - ios_arm64 Cross-compile for iOS Arm64 (iPhone 5S, iPad mini Retina, iPad Air) linux32 Cross-compile Unicorn on 64-bit Linux to target 32-bit binary msvc_update_genfiles Generate files for MSVC projects EOF @@ -37,25 +33,6 @@ asan() { env UNICORN_DEBUG=yes UNICORN_ASAN=yes "${MAKE}" V=1 } -# build iOS lib for all iDevices, or only specific device -build_iOS() { - IOS_SDK=$(xcrun --sdk iphoneos --show-sdk-path) - IOS_CC=$(xcrun --sdk iphoneos -f clang) - IOS_CFLAGS="-Os -Wimplicit -isysroot $IOS_SDK" - IOS_LDFLAGS="-isysroot $IOS_SDK" - if [ -z "$1" ]; then - # build for all iDevices - IOS_ARCHS="armv7 armv7s arm64" - else - IOS_ARCHS="$1" - fi - CC="$IOS_CC" \ - CFLAGS="$IOS_CFLAGS" \ - LDFLAGS="$IOS_LDFLAGS" \ - LIBARCHS="$IOS_ARCHS" \ - ${MAKE} -} - build_cross() { [ "$UNAME" = Darwin ] && LIBARCHS="i386 x86_64" CROSS=$1 @@ -153,10 +130,6 @@ case "$1" in "cross-win64" ) build_cross x86_64-w64-mingw32;; "cross-android_arm" ) CROSS=arm-linux-androideabi ${MAKE};; "cross-android_arm64" ) CROSS=aarch64-linux-android ${MAKE};; - "ios" ) build_iOS;; - "ios_armv7" ) build_iOS armv7;; - "ios_armv7s" ) build_iOS armv7s;; - "ios_arm64" ) build_iOS arm64;; "linux32" ) build_linux32;; "msvc_update_genfiles" ) msvc_update_genfiles;; * )