Skip to content

Commit 31b7684

Browse files
committed
bugfix rust lib builds
1 parent 6ab6f7b commit 31b7684

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

bin/lib/rust_library_builder.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ def writebuildscript(
143143
linkerpath = os.path.join(build_method["linker"], "bin")
144144
methodflags = build_method["build_method"]
145145

146+
f.write(f"export CC={linkerpath}/gcc\n")
147+
f.write(f"export CXX={linkerpath}/g++\n")
146148
f.write(f"export PATH={rustbinpath}:{linkerpath}\n")
147149
f.write(f'export RUSTFLAGS="-C linker={linkerpath}/gcc"\n')
148150

@@ -475,7 +477,7 @@ def makebuildfor(
475477
source_staging,
476478
):
477479
with self.install_context.new_staging_dir() as staging:
478-
build_method = dict({"build_method": "--all-features", "linker": "/opt/compiler-explorer/gcc-11.1.0"})
480+
build_method = dict({"build_method": "--all-features", "linker": "/opt/compiler-explorer/gcc-12.4.0"})
479481
build_status = self.makebuildfor_by_method(
480482
compiler,
481483
options,
@@ -494,7 +496,7 @@ def makebuildfor(
494496
source_staging,
495497
)
496498
if build_status == BuildStatus.Failed or build_status == BuildStatus.Skipped:
497-
build_method = dict({"build_method": "", "linker": "/opt/compiler-explorer/gcc-11.1.0"})
499+
build_method = dict({"build_method": "", "linker": "/opt/compiler-explorer/gcc-12.4.0"})
498500
build_status = self.makebuildfor_by_method(
499501
compiler,
500502
options,

0 commit comments

Comments
 (0)