squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix asm compiler flags change from cmake 0.1.44

Browse source 
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.
This commit is contained in:
Tomasz Miąsko 2020-08-18 12:55:54 -07:00 committed by Jubilee Young
parent 25441fb60a
commit 8c40426051
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/native.rs
View file

@ -454,7 +454,8 @@ fn configure_cmake(
}
}
cfg.define("CMAKE_C_COMPILER", sanitize_cc(cc))
.define("CMAKE_CXX_COMPILER", sanitize_cc(cxx));
.define("CMAKE_CXX_COMPILER", sanitize_cc(cxx))
.define("CMAKE_ASM_COMPILER", sanitize_cc(cc));
}
cfg.build_arg("-j").build_arg(builder.jobs().to_string());