@@ -484,7 +484,7 @@ impl Step for Llvm {
484
484
cfg. define ( "LLVM_VERSION_SUFFIX" , suffix) ;
485
485
}
486
486
487
- configure_cmake ( builder, target, & mut cfg, true , ldflags, & [ ] ) ;
487
+ configure_cmake ( builder, target, & mut cfg, true , ldflags) ;
488
488
configure_llvm ( builder, target, & mut cfg) ;
489
489
490
490
for ( key, val) in & builder. config . llvm_build_config {
@@ -573,7 +573,6 @@ fn configure_cmake(
573
573
cfg : & mut cmake:: Config ,
574
574
use_compiler_launcher : bool ,
575
575
mut ldflags : LdFlags ,
576
- extra_compiler_flags : & [ & str ] ,
577
576
) {
578
577
// Do not print installation messages for up-to-date files.
579
578
// LLVM and LLD builds can produce a lot of those and hit CI limits on log size.
@@ -716,9 +715,6 @@ fn configure_cmake(
716
715
if builder. config . llvm_clang_cl . is_some ( ) {
717
716
cflags. push ( & format ! ( " --target={target}" ) ) ;
718
717
}
719
- for flag in extra_compiler_flags {
720
- cflags. push ( & format ! ( " {flag}" ) ) ;
721
- }
722
718
cfg. define ( "CMAKE_C_FLAGS" , cflags) ;
723
719
let mut cxxflags: OsString = builder. cflags ( target, GitRepo :: Llvm , CLang :: Cxx ) . join ( " " ) . into ( ) ;
724
720
if let Some ( ref s) = builder. config . llvm_cxxflags {
@@ -728,9 +724,6 @@ fn configure_cmake(
728
724
if builder. config . llvm_clang_cl . is_some ( ) {
729
725
cxxflags. push ( & format ! ( " --target={target}" ) ) ;
730
726
}
731
- for flag in extra_compiler_flags {
732
- cxxflags. push ( & format ! ( " {flag}" ) ) ;
733
- }
734
727
cfg. define ( "CMAKE_CXX_FLAGS" , cxxflags) ;
735
728
if let Some ( ar) = builder. ar ( target) {
736
729
if ar. is_absolute ( ) {
@@ -899,7 +892,7 @@ impl Step for Lld {
899
892
ldflags. push_all ( "-Wl,-rpath,'$ORIGIN/../../../'" ) ;
900
893
}
901
894
902
- configure_cmake ( builder, target, & mut cfg, true , ldflags, & [ ] ) ;
895
+ configure_cmake ( builder, target, & mut cfg, true , ldflags) ;
903
896
configure_llvm ( builder, target, & mut cfg) ;
904
897
905
898
// Re-use the same flags as llvm to control the level of debug information
@@ -998,16 +991,7 @@ impl Step for Sanitizers {
998
991
// Unfortunately sccache currently lacks support to build them successfully.
999
992
// Disable compiler launcher on Darwin targets to avoid potential issues.
1000
993
let use_compiler_launcher = !self . target . contains ( "apple-darwin" ) ;
1001
- let extra_compiler_flags: & [ & str ] =
1002
- if self . target . contains ( "apple" ) { & [ "-fembed-bitcode=off" ] } else { & [ ] } ;
1003
- configure_cmake (
1004
- builder,
1005
- self . target ,
1006
- & mut cfg,
1007
- use_compiler_launcher,
1008
- LdFlags :: default ( ) ,
1009
- extra_compiler_flags,
1010
- ) ;
994
+ configure_cmake ( builder, self . target , & mut cfg, use_compiler_launcher, LdFlags :: default ( ) ) ;
1011
995
1012
996
t ! ( fs:: create_dir_all( & out_dir) ) ;
1013
997
cfg. out_dir ( out_dir) ;
0 commit comments