Skip to content

Commit 8c40426

Browse files
tmiaskoworkingjubilee
authored andcommitted
Fix asm compiler flags change from cmake 0.1.44
cmake-rs@8141f0e changed the logic for handling asm compiler flags. This change was pulled in with the cmake 0.1.42 -> 0.1.44 update. This introduced two new flags to the LLVM build, breaking it: "-DCMAKE_ASM_FLAGS= -ffunction-sections -fdata-sections -fPIC -m64" "-DCMAKE_ASM_COMPILER=/usr/bin/cc" This patch should resolve the breakage by handling it in bootstrap.
1 parent 25441fb commit 8c40426

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/bootstrap/native.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,8 @@ fn configure_cmake(
454454
}
455455
}
456456
cfg.define("CMAKE_C_COMPILER", sanitize_cc(cc))
457-
.define("CMAKE_CXX_COMPILER", sanitize_cc(cxx));
457+
.define("CMAKE_CXX_COMPILER", sanitize_cc(cxx))
458+
.define("CMAKE_ASM_COMPILER", sanitize_cc(cc));
458459
}
459460

460461
cfg.build_arg("-j").build_arg(builder.jobs().to_string());

0 commit comments

Comments
 (0)