From 534d1945feef2ce5266bf996a00c167e0da8903e Mon Sep 17 00:00:00 2001 From: Ali <> Date: Wed, 9 Dec 2020 22:49:36 +0400 Subject: [PATCH] [Temp] Build external dependencies under Rosetta emulation [skip ci] --- third-party/libvpx/BUILD | 2 +- third-party/mozjpeg/BUILD | 2 +- third-party/yasm/BUILD | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/third-party/libvpx/BUILD b/third-party/libvpx/BUILD index 58aa5c2297..62533a718d 100644 --- a/third-party/libvpx/BUILD +++ b/third-party/libvpx/BUILD @@ -59,7 +59,7 @@ genrule( mkdir -p "$$BUILD_DIR/Public/libvpx" - sh $$BUILD_DIR/build-libvpx-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/libvpx" "$$BUILD_DIR" + arch -x86_64 sh $$BUILD_DIR/build-libvpx-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/libvpx" "$$BUILD_DIR" """ + "\n".join([ "cp -f \"$$BUILD_DIR/VPX.framework/Headers/vpx/{}\" \"$(location Public/vpx/{})\"".format(header, header) for header in headers diff --git a/third-party/mozjpeg/BUILD b/third-party/mozjpeg/BUILD index 21b69c34c4..94e7865ec6 100644 --- a/third-party/mozjpeg/BUILD +++ b/third-party/mozjpeg/BUILD @@ -55,7 +55,7 @@ genrule( mkdir -p "$$BUILD_DIR/Public/mozjpeg" - PATH="$$PATH:$$CMAKE_DIR/cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin" sh $$BUILD_DIR/build-mozjpeg-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/mozjpeg" "$$BUILD_DIR" + PATH="$$PATH:$$CMAKE_DIR/cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin" arch -x86_64 sh $$BUILD_DIR/build-mozjpeg-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/mozjpeg" "$$BUILD_DIR" """ + "\n".join([ "cp -f \"$$BUILD_DIR/mozjpeg/{}\" \"$(location Public/mozjpeg/{})\"".format(header, header) for header in headers diff --git a/third-party/yasm/BUILD b/third-party/yasm/BUILD index 8e3e654a39..1970b6b67c 100644 --- a/third-party/yasm/BUILD +++ b/third-party/yasm/BUILD @@ -23,8 +23,8 @@ set -x pushd "$$BUILD_DIR/yasm-1.3.0" mkdir build cd build - PATH="$$PATH:$$CMAKE_DIR/cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin" cmake .. -DYASM_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF - make -j $$core_count + PATH="$$PATH:$$CMAKE_DIR/cmake-3.18.4-Darwin-x86_64/CMake.app/Contents/bin" arch -x86_64 cmake .. -DYASM_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF + arch -x86_64 make -j $$core_count popd tar -cf "$(location yasm.tar)" -C "$$BUILD_DIR/yasm-1.3.0/build" .