diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | scripts/main.mk | 5 |
2 files changed, 9 insertions, 12 deletions
@@ -66,21 +66,17 @@ Xcode/ios: iproj: Xcode/ios open ./build/ios-all/gyp/ios.xcodeproj -.PHONY: ios ibench isim -ios ibench isim: - export XCODEBUILD_ARGS += PROVISIONING_PROFILE="$$(PROVISIONING_PROFILE)" - +.PHONY: ios ios: - export XCODEBUILD_ARGS += -sdk iphoneos ARCHS="arm64 armv7 armv7s" - $(RUN) HOST=ios Xcode/iosapp + $(RUN) HOST=ios XCODEBUILD_ARGS='-sdk iphoneos ARCHS="arm64 armv7 armv7s"' Xcode/iosapp +.PHONY: isim isim: - export XCODEBUILD_ARGS += -sdk iphonesimulator ARCHS="x86_64 i386" - $(RUN) HOST=ios Xcode/iosapp + $(RUN) HOST=ios XCODEBUILD_ARGS='-sdk iphonesimulator ARCHS="x86_64 i386"' Xcode/iosapp +.PHONY: ibench ibench: - export XCODEBUILD_ARGS += -sdk iphoneos ARCHS="arm64" - $(RUN) HOST=ios Xcode/ios-bench + $(RUN) HOST=ios XCODEBUILD_ARGS='-sdk iphoneos ARCHS="arm64"' Xcode/ios-bench .PHONY: ipackage ipackage: Xcode/ios diff --git a/scripts/main.mk b/scripts/main.mk index d71bccc2e9..889222719e 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -128,7 +128,7 @@ Makefile/%: Makefile/__project__ Xcode/node: Xcode/__project__ node/xproj @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target node...$(FORMAT_END)\n" - $(QUIET)$(ENV) set -o pipefail && xcodebuild \ + xcodebuild \ $(XCODEBUILD_ARGS) \ -project ./build/binding.xcodeproj \ -configuration $(BUILDTYPE) \ @@ -137,7 +137,8 @@ Xcode/node: Xcode/__project__ node/xproj Xcode/%: Xcode/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" - $(QUIET)$(ENV) set -o pipefail && xcodebuild \ + xcodebuild \ + PROVISIONING_PROFILE="$(PROVISIONING_PROFILE)" \ $(XCODEBUILD_ARGS) \ -project ./build/$(HOST_SLUG)/gyp/$(HOST).xcodeproj \ -configuration $(BUILDTYPE) \ |