From ccb9ba34415993c4460ffe84d83c56a52b6a56f6 Mon Sep 17 00:00:00 2001 From: Will Speak Date: Sat, 6 Oct 2018 09:02:10 +0100 Subject: [PATCH] Disable 32 bit macOS Build With the latest XCode it looks like 32 bit builds are deprecated. This causes build warnings which fail the libuv build. This commit remvoves the 32 bit arch from the macOS libuv build, and stops building the 32 build on Travis. --- .gitignore | 3 +++ .travis.yml | 2 +- util/build_libuv.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c6483dbc..59f6f6d2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ ipch/ *.user *.userosscache *.sln.docstates + +# macOS XCode build cache +deps/libuv/build/XCBuildData/ diff --git a/.travis.yml b/.travis.yml index dab7dee3..a004f102 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ compiler: - gcc - clang env: - - WREN_OPTIONS="" CI_ARCHS="ci_32 ci_64" + - WREN_OPTIONS="" CI_ARCHS="ci_64" - WREN_OPTIONS="-DWREN_NAN_TAGGING=0" CI_ARCHS="ci_64" # Automatically build and deploy docs. diff --git a/util/build_libuv.py b/util/build_libuv.py index b6152f71..65f1f9e2 100755 --- a/util/build_libuv.py +++ b/util/build_libuv.py @@ -26,7 +26,7 @@ def build_libuv_mac(): run([ "xcodebuild", # Build a 32-bit + 64-bit universal binary: - "ARCHS=i386 x86_64", "ONLY_ACTIVE_ARCH=NO", + "ARCHS=x86_64", "ONLY_ACTIVE_ARCH=NO", "BUILD_DIR=out", "-project", LIB_UV_DIR + "/uv.xcodeproj", "-configuration", "Release",