Skip to content

Commit cd1b845

Browse files
committed
Auto merge of rust-lang#31074 - gmbonnet:stage0-libdir, r=alexcrichton
This fixes rust-lang#27254. On a 64-bit Linux machine, for example, `configure --libdir=/usr/local/lib64` was creating both `x86_64-unknown-linux-gnu/stage0/lib/rustlib` and `x86_64-unknown-linux-gnu/stage0/lib64/rustlib`. Crates from the stage0 snapshot, like `libcore`, are extracted to `x86_64-unknown-linux-gnu/stage0/lib/rustlib`, but the stage0 compiler was attempting to find them in `x86_64-unknown-linux-gnu/stage0/lib64/rustlib`, which has the highest priority on a 64-bit system. The issue can be fixed by creating only `x86_64-unknown-linux-gnu/stage0/lib/rustlib`, since this is the only rustlib directory needed for stage0 anyways.
2 parents b4a2579 + 6aa86e5 commit cd1b845

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

configure

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1361,16 +1361,22 @@ for h in $CFG_HOST
13611361
do
13621362
for t in $CFG_TARGET
13631363
do
1364+
# host bin dir stage0
1365+
make_dir $h/stage0/bin
1366+
13641367
# host lib dir stage0
13651368
make_dir $h/stage0/lib
13661369

1370+
# host test dir stage0
1371+
make_dir $h/stage0/test
1372+
13671373
# target bin dir stage0
13681374
make_dir $h/stage0/lib/rustlib/$t/bin
13691375

13701376
# target lib dir stage0
13711377
make_dir $h/stage0/lib/rustlib/$t/lib
13721378

1373-
for i in 0 1 2 3
1379+
for i in 1 2 3
13741380
do
13751381
# host bin dir
13761382
make_dir $h/stage$i/bin

0 commit comments

Comments
 (0)