diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2017-05-17 11:04:27 -0400 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2017-05-17 11:16:00 -0400 |
commit | 371ebc89ca8cfb48f9624981aab72563afb892b9 (patch) | |
tree | 45643adcfd6ee3b49a07c54c1ec08d0ec4e4c93c /pkgs/top-level/release-cross.nix | |
parent | 296753f0947427d5753be68ae10363ac1b8b4cdc (diff) | |
download | nixlib-371ebc89ca8cfb48f9624981aab72563afb892b9.tar nixlib-371ebc89ca8cfb48f9624981aab72563afb892b9.tar.gz nixlib-371ebc89ca8cfb48f9624981aab72563afb892b9.tar.bz2 nixlib-371ebc89ca8cfb48f9624981aab72563afb892b9.tar.lz nixlib-371ebc89ca8cfb48f9624981aab72563afb892b9.tar.xz nixlib-371ebc89ca8cfb48f9624981aab72563afb892b9.tar.zst nixlib-371ebc89ca8cfb48f9624981aab72563afb892b9.zip |
lib platform parsing: Fix windows support to conform to LLVM, take 2
Second attempt at pull request #25275 This reverts commit b70924bd80918d153a5e2023afd7647ae7b24a12, reapplying 2282a5774cd80567644a44d31585bf965a55f9ec
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r-- | pkgs/top-level/release-cross.nix | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 824289726995..b22eff33dc07 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -20,12 +20,27 @@ let /* Basic list of packages to be natively built, but need a crossSystem defined to get meaning */ basicNativeDrv = { + buildPackages.binutils = nativePlatforms; buildPackages.gccCrossStageFinal = nativePlatforms; buildPackages.gdbCross = nativePlatforms; }; basic = basicCrossDrv // basicNativeDrv; + windows = { + buildPackages.binutils = nativePlatforms; + buildPackages.gccCrossStageFinal = nativePlatforms; + + coreutils = nativePlatforms; + boehmgc = nativePlatforms; + gmp = nativePlatforms; + guile_1_8 = nativePlatforms; + libffi = nativePlatforms; + libtool = nativePlatforms; + libunistring = nativePlatforms; + windows.wxMSW = nativePlatforms; + }; + in { @@ -89,48 +104,30 @@ in /* Test some cross builds on 32 bit mingw-w64 */ crossMingw32 = let crossSystem = { - config = "i686-w64-mingw32"; + config = "i686-pc-mingw32"; arch = "x86"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; - in mapTestOnCross crossSystem { - coreutils = nativePlatforms; - boehmgc = nativePlatforms; - gmp = nativePlatforms; - guile_1_8 = nativePlatforms; - libffi = nativePlatforms; - libtool = nativePlatforms; - libunistring = nativePlatforms; - windows.wxMSW = nativePlatforms; - }; + in mapTestOnCross crossSystem windows; /* Test some cross builds on 64 bit mingw-w64 */ crossMingwW64 = let crossSystem = { # That's the triplet they use in the mingw-w64 docs. - config = "x86_64-w64-mingw32"; + config = "x86_64-pc-mingw32"; arch = "x86_64"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; - in mapTestOnCross crossSystem { - coreutils = nativePlatforms; - boehmgc = nativePlatforms; - gmp = nativePlatforms; - guile_1_8 = nativePlatforms; - libffi = nativePlatforms; - libtool = nativePlatforms; - libunistring = nativePlatforms; - windows.wxMSW = nativePlatforms; - }; + in mapTestOnCross crossSystem windows; /* Linux on the fuloong */ fuloongminipc = let crossSystem = { - config = "mips64el-unknown-linux"; + config = "mips64el-unknown-linux-gnu"; bigEndian = false; arch = "mips"; float = "hard"; |