Skip to content

Commit 9bf5cb4

Browse files
committed
Fix indirectly linking to libstd.so with the JIT
1 parent 7f60301 commit 9bf5cb4

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ if [[ "$build_sysroot" == "1" ]]; then
5757
dir=$(pwd)
5858
cd "$target_dir"
5959
time "$dir/build_sysroot/build_sysroot.sh"
60+
cp lib/rustlib/*/lib/libstd-* lib/
6061
fi

build_sysroot/build_sysroot.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export CARGO_TARGET_DIR=target
2525

2626
# Build libs
2727
export RUSTFLAGS="$RUSTFLAGS -Zforce-unstable-if-unmarked -Cpanic=abort"
28+
export __CARGO_DEFAULT_LIB_METADATA="cg_clif"
2829
if [[ "$1" != "--debug" ]]; then
2930
sysroot_channel='release'
3031
# FIXME Enable incremental again once rust-lang/rust#74946 is fixed

scripts/config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ if [[ $(uname) == 'Darwin' ]]; then
5353
export RUSTFLAGS="$RUSTFLAGS -Clink-arg=-undefined -Clink-arg=dynamic_lookup"
5454
fi
5555

56-
export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
56+
export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib:"$dir"/lib"
5757
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
5858

0 commit comments

Comments
 (0)