Skip to content

Commit f9fc207

Browse files
committed
test
1 parent ba6926d commit f9fc207

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

setup.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ cd firefox-source
5454
sed -i'' -e 's/os not in ("WINNT", "OSX", "Android")/os not in ("WINNT", "Android")/' ./build/moz.configure/pkg.configure # use pkg-config on macOS
5555
sed -i'' -e '/"WindowsDllMain.cpp"/d' ./mozglue/misc/moz.build # https://discourse.mozilla.org/t/105671, https://bugzilla.mozilla.org/show_bug.cgi?id=1751561
5656
sed -i'' -e '/"winheap.cpp"/d' ./memory/mozalloc/moz.build # https://bugzilla.mozilla.org/show_bug.cgi?id=1802675
57-
sed -i'' -e 's/"install-name-tool"/"install_name_tool"/' ./moz.configure # `install-name-tool` does not exist, but we have `install_name_tool`
5857
sed -i'' -e 's/bool Unbox/JS_PUBLIC_API bool Unbox/g' ./js/public/Class.h # need to manually add JS_PUBLIC_API to js::Unbox until it gets fixed in Spidermonkey
5958
sed -i'' -e 's/bool js::Unbox/JS_PUBLIC_API bool js::Unbox/g' ./js/src/vm/JSObject.cpp # same here
6059
sed -i'' -e 's/shared_lib = self._pretty_path(libdef.output_path, backend_file)/shared_lib = libdef.lib_name/' ./python/mozbuild/mozbuild/backend/recursivemake.py # would generate a Makefile to install the binary files from an invalid path prefix
@@ -68,9 +67,9 @@ cd js/src
6867
mkdir -p _build
6968
cd _build
7069
mkdir -p ../../../../_spidermonkey_install/
71-
$(if [[ "$OSTYPE" == "darwin"* ]]; then echo "LD=$(brew --prefix llvm@15)/bin/lld HOST_LD=$(brew --prefix llvm@15)/bin/lld"; fi) \
7270
../configure --target=$(clang --print-target-triple) \
7371
--prefix=$(realpath $PWD/../../../../_spidermonkey_install) \
72+
$(if [[ "$OSTYPE" == "darwin"* ]]; then echo "--with-toolchain-prefix=$(brew --prefix llvm@15)/bin/"; fi) \
7473
--with-intl-api \
7574
$(if [[ "$OSTYPE" != "msys"* ]]; then echo "--without-system-zlib"; fi) \
7675
--disable-debug-symbols \

0 commit comments

Comments
 (0)