Skip to content

Commit 2dbf600

Browse files
authored
Auto merge of #36242 - semarie:local-rebuild, r=alexcrichton
Use libraries from local-rust-root directory in configure when using … …--enable-local-rebuild When using --enable-local-rebuild configure options, the configure script will test rustc version. But when running it, it will not use the libraries in the local-rust-root directory. So use `LD_LIBRARY_PATH` environment variable to correct it. Under OpenBSD, we use `--enable-local-rebuild` for rebuilding rustc-1.11.0 using rustc-1.11.0. But as it is in use in -current (the developpment branch of OpenBSD), system libraries could easily have ABI/API changes. The (unofficial) bootstrap (rustc-1.11.0 used for building rustc-1.11.0) include several system libraries to permit it to run. The build system use libraries in stage0/lib directory. But the configure script doesn't. Due to my special use of `--enable-local-rebuild`, I dunno if this PR is suitable for inclusion. But it corrects a difference between build and configure use of the binary. r? @alexcrichton
2 parents 86995dc + 92aa7e4 commit 2dbf600

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ then
900900
fi
901901

902902
CMD="${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF}"
903-
LRV=`$CMD --version`
903+
LRV=`LD_LIBRARY_PATH=${CFG_LOCAL_RUST_ROOT}/lib $CMD --version`
904904
if [ $? -ne 0 ]
905905
then
906906
step_msg "failure while running $CMD --version"

0 commit comments

Comments
 (0)