@@ -33,6 +33,7 @@ fn main() {
3333 build. flag_if_supported ( "-g" ) ;
3434 build. flag_if_supported ( "-fomit-frame-pointer" ) ;
3535 build. flag_if_supported ( "-fpermissive" ) ;
36+ build. static_crt ( true ) ;
3637 build. cpp ( true ) ;
3738 build. debug ( false ) ;
3839
@@ -45,11 +46,9 @@ fn main() {
4546 if cfg ! ( feature = "android-lld" ) {
4647 build. define ( "ANDROID_LD" , "lld" ) ;
4748 }
48-
4949 if cfg ! ( feature = "android-shared-stl" ) {
5050 build. define ( "ANDROID_STL" , "c++_shared" ) ;
5151 }
52-
5352 if triple. contains ( "aarch64" ) {
5453 build. define ( "ANDROID_ABI" , "arm64-v8a" ) ;
5554 } else if triple. contains ( "armv7" ) {
@@ -66,16 +65,7 @@ fn main() {
6665 }
6766 }
6867
69- if target_os == "windows" && target_env == "gnu" {
70- build. define ( "CMAKE_SH" , "CMAKE_SH-NOTFOUND" ) ;
71- if cfg ! ( feature = "local_dynamic_tls" ) {
72- build. flag_if_supported ( "-ftls-model=local-dynamic" ) ;
73- } else {
74- build. flag_if_supported ( "-ftls-model=initial-exec" ) ;
75- }
76- }
77-
78- if target_family == "unix" && target_os != "haiku" {
68+ if target_family == "unix" || target_env == "gnu" && target_os != "haiku" {
7969 if cfg ! ( feature = "local_dynamic_tls" ) {
8070 build. flag_if_supported ( "-ftls-model=local-dynamic" ) ;
8171 } else {
@@ -119,7 +109,6 @@ fn main() {
119109 }
120110
121111 if target_os == "windows" && target_env == "gnu" {
122- //using cc
123112 println ! ( "cargo:rustc-link-lib=dylib=atomic" ) ;
124113 }
125114
@@ -141,7 +130,6 @@ fn main() {
141130 } ;
142131}
143132
144-
145133#[ cfg( not( feature = "build_cc" ) ) ]
146134fn main ( ) {
147135 let mut cfg = & mut cmake:: Config :: new ( "snmalloc" ) ;
0 commit comments