@@ -508,7 +508,7 @@ impl Step for Llvm {
508
508
cfg. define ( "LLVM_VERSION_SUFFIX" , suffix) ;
509
509
}
510
510
511
- configure_cmake ( builder, target, & mut cfg, true , ldflags, & [ ] , & [ ] ) ;
511
+ configure_cmake ( builder, target, & mut cfg, true , ldflags, & [ ] ) ;
512
512
configure_llvm ( builder, target, & mut cfg) ;
513
513
514
514
for ( key, val) in & builder. config . llvm_build_config {
@@ -597,7 +597,6 @@ fn configure_cmake(
597
597
cfg : & mut cmake:: Config ,
598
598
use_compiler_launcher : bool ,
599
599
mut ldflags : LdFlags ,
600
- extra_compiler_flags : & [ & str ] ,
601
600
suppressed_compiler_flag_prefixes : & [ & str ] ,
602
601
) {
603
602
// Do not print installation messages for up-to-date files.
@@ -751,9 +750,6 @@ fn configure_cmake(
751
750
if builder. config . llvm_clang_cl . is_some ( ) {
752
751
cflags. push ( & format ! ( " --target={target}" ) ) ;
753
752
}
754
- for flag in extra_compiler_flags {
755
- cflags. push ( & format ! ( " {flag}" ) ) ;
756
- }
757
753
cfg. define ( "CMAKE_C_FLAGS" , cflags) ;
758
754
let mut cxxflags: OsString = builder
759
755
. cflags ( target, GitRepo :: Llvm , CLang :: Cxx )
@@ -773,9 +769,6 @@ fn configure_cmake(
773
769
if builder. config . llvm_clang_cl . is_some ( ) {
774
770
cxxflags. push ( & format ! ( " --target={target}" ) ) ;
775
771
}
776
- for flag in extra_compiler_flags {
777
- cxxflags. push ( & format ! ( " {flag}" ) ) ;
778
- }
779
772
cfg. define ( "CMAKE_CXX_FLAGS" , cxxflags) ;
780
773
if let Some ( ar) = builder. ar ( target) {
781
774
if ar. is_absolute ( ) {
@@ -944,7 +937,7 @@ impl Step for Lld {
944
937
ldflags. push_all ( "-Wl,-rpath,'$ORIGIN/../../../'" ) ;
945
938
}
946
939
947
- configure_cmake ( builder, target, & mut cfg, true , ldflags, & [ ] , & [ ] ) ;
940
+ configure_cmake ( builder, target, & mut cfg, true , ldflags, & [ ] ) ;
948
941
configure_llvm ( builder, target, & mut cfg) ;
949
942
950
943
// Re-use the same flags as llvm to control the level of debug information
@@ -1043,8 +1036,6 @@ impl Step for Sanitizers {
1043
1036
// Unfortunately sccache currently lacks support to build them successfully.
1044
1037
// Disable compiler launcher on Darwin targets to avoid potential issues.
1045
1038
let use_compiler_launcher = !self . target . contains ( "apple-darwin" ) ;
1046
- let extra_compiler_flags: & [ & str ] =
1047
- if self . target . contains ( "apple" ) { & [ "-fembed-bitcode=off" ] } else { & [ ] } ;
1048
1039
// Since v1.0.86, the cc crate adds -mmacosx-version-min to the default
1049
1040
// flags on MacOS. A long-standing bug in the CMake rules for compiler-rt
1050
1041
// causes architecture detection to be skipped when this flag is present,
@@ -1057,7 +1048,6 @@ impl Step for Sanitizers {
1057
1048
& mut cfg,
1058
1049
use_compiler_launcher,
1059
1050
LdFlags :: default ( ) ,
1060
- extra_compiler_flags,
1061
1051
suppressed_compiler_flag_prefixes,
1062
1052
) ;
1063
1053
0 commit comments