Skip to content

Commit ddde5c0

Browse files
committed
fixup
1 parent 07c4544 commit ddde5c0

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

setup.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ sed -i'' -e 's/return JS::GetWeakRefsEnabled() == JS::WeakRefSpecifier::Disabled
6262
sed -i'' -e 's/return !IsIteratorHelpersEnabled()/return false/' ./js/src/vm/GlobalObject.cpp # forcibly enable iterator helpers
6363
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
6464
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`
65-
sed -i'' -e 's|-id $(abspath $(libdir)|-id $(abspath @rpath|' ./js/src/build/Makefile.in # Set the `install_name` field to use RPATH instead of an absolute path
65+
sed -i'' -e 's|-id $(abspath $(libdir)|-id $(abspath @rpath|' ./js/src/build/Makefile.in # Set the `install_name` field of libmozjs dylib to use the RPATH instead of an absolute path
6666
cd js/src
6767
mkdir -p _build
6868
cd _build
@@ -81,12 +81,6 @@ echo "Done building spidermonkey"
8181
echo "Installing spidermonkey"
8282
# install to ../../../../_spidermonkey_install/
8383
make install
84-
# if [[ "$OSTYPE" == "darwin"* ]]; then # macOS
85-
# cd ../../../../_spidermonkey_install/lib/
86-
# # Set the `install_name` field to use RPATH instead of an absolute path
87-
# # overrides https://hg.mozilla.org/releases/mozilla-esr102/file/89d799cb/js/src/build/Makefile.in#l83
88-
# llvm-install-name-tool -id @rpath/$(basename ./libmozjs*) ./libmozjs* # making it work for whatever name the libmozjs dylib is called
89-
# fi
9084
echo "Done installing spidermonkey"
9185

9286
# if this is being ran in the root directory of the PythonMonkey repo, then include dev configurations

0 commit comments

Comments
 (0)