File tree 2 files changed +8
-2
lines changed
2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ CFG_INSTALL_ONLY_RLIB_x86_64-unknown-linux-musl = 1
7
7
CFG_LIB_NAME_x86_64-unknown-linux-musl =lib$(1 ) .so
8
8
CFG_STATIC_LIB_NAME_x86_64-unknown-linux-musl =lib$(1 ) .a
9
9
CFG_LIB_GLOB_x86_64-unknown-linux-musl =lib$(1 ) -*.so
10
- CFG_JEMALLOC_CFLAGS_x86_64-unknown-linux-musl := -m64
11
- CFG_GCCISH_CFLAGS_x86_64-unknown-linux-musl := -g -fPIC -m64
10
+ CFG_JEMALLOC_CFLAGS_x86_64-unknown-linux-musl := -m64 -Wa,-mrelax-relocations=no
11
+ CFG_GCCISH_CFLAGS_x86_64-unknown-linux-musl := -g -fPIC -m64 -Wa,-mrelax-relocations=no
12
12
CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-musl :=
13
13
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-musl :=
14
14
CFG_GCCISH_DEF_FLAG_x86_64-unknown-linux-musl :=
Original file line number Diff line number Diff line change @@ -855,6 +855,12 @@ impl Build {
855
855
base. push ( "-stdlib=libc++" . into ( ) ) ;
856
856
base. push ( "-mmacosx-version-min=10.7" . into ( ) ) ;
857
857
}
858
+ // This is a hack, because newer binutils broke things
859
+ // on some vms/distros (i.e., linking against unknown relocs disabled by the following flag)
860
+ // See: https://github.com/rust-lang/rust/issues/34978
861
+ if target == "x86_64-unknown-linux-musl" {
862
+ base. push ( "-Wa,-mrelax-relocations=no" . into ( ) ) ;
863
+ }
858
864
return base
859
865
}
860
866
You can’t perform that action at this time.
0 commit comments