Skip to content

Commit b0f0f9b

Browse files
committed
fix(CI): always use ld64 for the linker on macOS because lld is not available in the CI machine
See also: https://searchfox.org/mozilla-central/rev/e741c34/build/moz.configure/toolchain.configure#1889
1 parent 3ac3c59 commit b0f0f9b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ sed -i'' -e 's/return JS::GetWeakRefsEnabled() == JS::WeakRefSpecifier::Disabled
6363
sed -i'' -e 's/return !IsIteratorHelpersEnabled()/return false/' ./js/src/vm/GlobalObject.cpp # forcibly enable iterator helpers
6464
sed -i'' -e '/MOZ_CRASH_UNSAFE_PRINTF/,/__PRETTY_FUNCTION__);/d' ./mfbt/LinkedList.h # would crash in Debug Build: in `~LinkedList()` it should have removed all this list's elements before the list's destruction
6565
sed -i'' -e '/MOZ_ASSERT(stackRootPtr == nullptr);/d' ./js/src/vm/JSContext.cpp # would assert false in Debug Build since we extensively use `new JS::Rooted`
66-
sed -E -i'' -e 's/target.kernel == "Darwin"$/False/' ./build/moz.configure/toolchain.configure # always use ld64 for the linker on macOS because lld is not available in the CI machine
6766
cd js/src
6867
mkdir -p _build
6968
cd _build
@@ -75,6 +74,7 @@ mkdir -p ../../../../_spidermonkey_install/
7574
--disable-debug-symbols \
7675
--disable-jemalloc \
7776
--disable-tests \
77+
$(if [[ "$OSTYPE" == "darwin"* ]]; then echo "--enable-linker=ld64"; fi) \
7878
--enable-optimize
7979
make -j$CPUS
8080
echo "Done building spidermonkey"

0 commit comments

Comments
 (0)