cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #89582 from input-output-hk/fix-rust-cross

Browse source 
rust: fix rust cross-compile
This commit is contained in:
John Ericson 2020-06-08 00:48:49 -04:00 committed by GitHub
commit b668fe8796
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/development/compilers/gcc/common/configure-flags.nix
View file

@ -27,6 +27,16 @@
assert cloog != null -> stdenv.lib.versionOlder version "5"; assert cloog != null -> stdenv.lib.versionOlder version "5";
assert langJava -> stdenv.lib.versionOlder version "7"; assert langJava -> stdenv.lib.versionOlder version "7";
# Note [Windows Exception Handling]
# sjlj (short jump long jump) exception handling makes no sense on x86_64,
# it's forcably slowing programs down as it produces a constant overhead.
# On x86_64 we have SEH (Structured Exception Handling) and we should use
# that. On i686, we do not have SEH, and have to use sjlj with dwarf2.
# Hence it's now conditional on x86_32 (i686 is 32bit).
#
# ref: https://stackoverflow.com/questions/15670169/what-is-difference-between-sjlj-vs-dwarf-vs-seh
let let
inherit (stdenv) inherit (stdenv)
buildPlatform hostPlatform targetPlatform buildPlatform hostPlatform targetPlatform
@ -58,8 +68,16 @@ let
"--with-gnu-as" "--with-gnu-as"
"--with-gnu-ld" "--with-gnu-ld"
"--disable-debug" "--disable-debug"
"--enable-sjlj-exceptions"
"--disable-win32-registry" "--disable-win32-registry"
"--enable-hash-synchronization"
"--enable-libssp"
"--disable-nls"
# To keep ABI compatibility with upstream mingw-w64
"--enable-fully-dynamic-string"
] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [
# See Note [Windows Exception Handling]
"--enable-sjlj-exceptions"
"--with-dwarf2"
] else [ ] else [
(if crossDarwin then "--with-sysroot=${lib.getLib libcCross}/share/sysroot" (if crossDarwin then "--with-sysroot=${lib.getLib libcCross}/share/sysroot"
else "--with-headers=${lib.getDev libcCross}${libcCross.incdir or "/include"}") else "--with-headers=${lib.getDev libcCross}${libcCross.incdir or "/include"}")
@ -80,14 +98,6 @@ let
] ++ lib.optionals (targetPlatform.libc == "musl") [ ] ++ lib.optionals (targetPlatform.libc == "musl") [
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
"--disable-libmpx" "--disable-libmpx"
] ++ lib.optionals crossMingw [
"--enable-sjlj-exceptions"
"--enable-hash-synchronization"
"--enable-libssp"
"--disable-nls"
"--with-dwarf2"
# To keep ABI compatibility with upstream mingw-w64
"--enable-fully-dynamic-string"
] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib" ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib"
++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
); );