diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-10-31 18:33:23 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:27:04 -0400 |
| commit | 2091133e789b22b33cdb85af99e36c5589faf1db (patch) | |
| tree | 3c72e53bee55865b978676b638bec2200fae0364 /pkgs/development/compilers/gcc/6/default.nix | |
| parent | 28a323e3310f0ae0827d11ad3d8af1bbcfef93db (diff) | |
| download | nixpkgs-2091133e789b22b33cdb85af99e36c5589faf1db.tar nixpkgs-2091133e789b22b33cdb85af99e36c5589faf1db.tar.gz nixpkgs-2091133e789b22b33cdb85af99e36c5589faf1db.tar.bz2 nixpkgs-2091133e789b22b33cdb85af99e36c5589faf1db.tar.lz nixpkgs-2091133e789b22b33cdb85af99e36c5589faf1db.tar.xz nixpkgs-2091133e789b22b33cdb85af99e36c5589faf1db.tar.zst nixpkgs-2091133e789b22b33cdb85af99e36c5589faf1db.zip | |
gcc: Clarify Disabling libmpx in cross stage static
This isn't a MUSL thing, but just needed for cross compilation to x86. No one had tried this when all cross compilation was to linux + glibc, hence why no one noticed this until recently.
Diffstat (limited to 'pkgs/development/compilers/gcc/6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 3f5d3172d12..e6825afcfa8 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -105,6 +105,7 @@ let version = "6.4.0"; "--enable-sjlj-exceptions" "--enable-threads=win32" "--disable-win32-registry" + "--disable-libmpx" # requires libc ] else if crossStageStatic then [ "--disable-libssp" "--disable-nls" @@ -113,11 +114,9 @@ let version = "6.4.0"; "--disable-libgomp" "--disable-libquadmath" "--disable-shared" - "--disable-libatomic" # libatomic requires libc - "--disable-decimal-float" # libdecnumber requires libc - # maybe only needed on musl, PATH_MAX - # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62 - "--disable-libmpx" + "--disable-libatomic" # requires libc + "--disable-decimal-float" # requires libc + "--disable-libmpx" # requires libc ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" else "--with-headers=${getDev libcCross}/include") |