diff --git a/.gitignore b/.gitignore index c6483dbc3..59f6f6d27 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 dab7dee38..a004f1026 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 b6152f717..65f1f9e24 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",