Skip to content

Commit c92735c

Browse files
committed
[GCC 14] Simplify logic to set LIB64 directory
1 parent a3990b1 commit c92735c

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

0_RootFS/gcc_common.jl

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,11 @@ function gcc_script(gcc_version::VersionNumber, compiler_target::Platform)
6565
sysroot="${prefix}/${COMPILER_TARGET}/sys-root"
6666
cp -ra "/opt/${COMPILER_TARGET}/${COMPILER_TARGET}" "${prefix}/${COMPILER_TARGET}"
6767
68-
# Some things need /lib64, others just need /lib
69-
case ${COMPILER_TARGET} in
70-
x86_64*)
71-
LIB64=lib64
72-
;;
73-
aarch64*)
74-
LIB64=lib64
75-
;;
76-
ppc64*)
77-
LIB64=lib64
78-
;;
79-
riscv64*)
68+
# Some things need /lib64, others just need /lib. Be consistent with where
69+
# our compiler wrappers expect the libraries to be:
70+
# <https://github.com/JuliaPackaging/BinaryBuilderBase.jl/blob/4d0883a222bcb60871f8e24e56ef6e322502ec80/src/Runner.jl#L553-L559>.
71+
case ${nbits} in
72+
64)
8073
LIB64=lib64
8174
;;
8275
*)

0 commit comments

Comments
 (0)