From 2091133e789b22b33cdb85af99e36c5589faf1db Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 31 Oct 2017 18:33:23 -0400 Subject: [PATCH] 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. --- pkgs/development/compilers/gcc/4.8/default.nix | 6 ++++-- pkgs/development/compilers/gcc/4.9/default.nix | 6 ++++-- pkgs/development/compilers/gcc/5/default.nix | 6 ++++-- pkgs/development/compilers/gcc/6/default.nix | 9 ++++----- pkgs/development/compilers/gcc/7/default.nix | 9 ++++----- pkgs/development/compilers/gcc/8/default.nix | 9 ++++----- pkgs/development/compilers/gcc/snapshot/default.nix | 6 ++++-- 7 files changed, 28 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ed185b4be1a2..60db368c403a 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -116,6 +116,7 @@ let version = "4.8.5"; "--enable-sjlj-exceptions" "--enable-threads=win32" "--disable-win32-registry" + "--disable-libmpx" # requires libc ] else if crossStageStatic then [ "--disable-libssp" "--disable-nls" @@ -124,8 +125,9 @@ let version = "4.8.5"; "--disable-libgomp" "--disable-libquadmath" "--disable-shared" - "--disable-libatomic" # libatomic requires libc - "--disable-decimal-float" # libdecnumber requires libc + "--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") diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 3f13562c1b8c..361db92cb767 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -121,6 +121,7 @@ let version = "4.9.4"; "--enable-sjlj-exceptions" "--enable-threads=win32" "--disable-win32-registry" + "--disable-libmpx" # requires libc ] else if crossStageStatic then [ "--disable-libssp" "--disable-nls" @@ -129,8 +130,9 @@ let version = "4.9.4"; "--disable-libgomp" "--disable-libquadmath" "--disable-shared" - "--disable-libatomic" # libatomic requires libc - "--disable-decimal-float" # libdecnumber requires libc + "--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") diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 497ca40c3ae6..2e51e9c05066 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -107,6 +107,7 @@ let version = "5.5.0"; "--enable-sjlj-exceptions" "--enable-threads=win32" "--disable-win32-registry" + "--disable-libmpx" # requires libc ] else if crossStageStatic then [ "--disable-libssp" "--disable-nls" @@ -115,8 +116,9 @@ let version = "5.5.0"; "--disable-libgomp" "--disable-libquadmath" "--disable-shared" - "--disable-libatomic" # libatomic requires libc - "--disable-decimal-float" # libdecnumber requires libc + "--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") diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 3f5d3172d12f..e6825afcfa84 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") diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 30c1611f5fb3..4dfbcf0f5458 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -77,6 +77,7 @@ let version = "7.3.0"; "--enable-sjlj-exceptions" "--enable-threads=win32" "--disable-win32-registry" + "--disable-libmpx" # requires libc ] else if crossStageStatic then [ "--disable-libssp" "--disable-nls" @@ -85,11 +86,9 @@ let version = "7.3.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") diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 727cd9cbdbd7..04054df8bf82 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -72,6 +72,7 @@ let version = "8.2.0"; "--enable-sjlj-exceptions" "--enable-threads=win32" "--disable-win32-registry" + "--disable-libmpx" # requires libc ] else if crossStageStatic then [ "--disable-libssp" "--disable-nls" @@ -80,11 +81,9 @@ let version = "8.2.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") diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index dd6de818117f..230409e97538 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -69,6 +69,7 @@ let version = "7-20170409"; "--enable-sjlj-exceptions" "--enable-threads=win32" "--disable-win32-registry" + "--disable-libmpx" # requires libc ] else if crossStageStatic then [ "--disable-libssp" "--disable-nls" @@ -77,8 +78,9 @@ let version = "7-20170409"; "--disable-libgomp" "--disable-libquadmath" "--disable-shared" - "--disable-libatomic" # libatomic requires libc - "--disable-decimal-float" # libdecnumber requires libc + "--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")