Skip to content

Commit 85bc611

Browse files
committed
Use correct linker
1 parent b310677 commit 85bc611

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

config.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ TARGET_TRIPLE="m68k-unknown-linux-gnu"
2626
linker=''
2727
RUN_WRAPPER=''
2828
if [[ "$HOST_TRIPLE" != "$TARGET_TRIPLE" ]]; then
29-
#if [[ "$TARGET_TRIPLE" == "m68k-unknown-linux-gnu" ]]; then
29+
if [[ "$TARGET_TRIPLE" == "m68k-unknown-linux-gnu" ]]; then
3030
#TARGET_TRIPLE="mips-unknown-linux-gnu"
31-
#linker='-Clinker=m68k-linux-gcc'
32-
#el
33-
if [[ "$TARGET_TRIPLE" == "aarch64-unknown-linux-gnu" ]]; then
31+
linker='-Clinker=m68k-unknown-linux-gnu-gcc'
32+
elif [[ "$TARGET_TRIPLE" == "aarch64-unknown-linux-gnu" ]]; then
3433
# We are cross-compiling for aarch64. Use the correct linker and run tests in qemu.
3534
linker='-Clinker=aarch64-linux-gnu-gcc'
3635
RUN_WRAPPER='qemu-aarch64 -L /usr/aarch64-linux-gnu'
@@ -61,5 +60,5 @@ export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
6160
# NOTE: To avoid the -fno-inline errors, use /opt/gcc/bin/gcc instead of cc.
6261
# To do so, add a symlink for cc to /opt/gcc/bin/gcc in our PATH.
6362
# Another option would be to add the following Rust flag: -Clinker=/opt/gcc/bin/gcc
64-
export PATH="/opt/m68k-gcc/bin:$PATH"
63+
export PATH="/opt/m68k-unknown-linux-gnu/bin:$PATH"
6564
export TARGET=$TARGET_TRIPLE

0 commit comments

Comments
 (0)