pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #185972 from Artturin/gccstrictdeps

gcc/: correct gnused conditionals

authored by

Artturi and committed by
GitHub 9adf0c20 51422b18

+44 -40
unified split
+4 -4
pkgs/development/compilers/gcc/10/default.nix
··· 33 33 assert libelf != null -> zlib != null; 34 34 35 35 # Make sure we get GNU sed. 36 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 36 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 37 37 38 38 # The go frontend is written in c++ 39 39 assert langGo -> langCC; ··· 159 159 nativeBuildInputs = [ texinfo which gettext ] 160 160 ++ (optional (perl != null) perl) 161 161 ++ (optional langAda gnatboot) 162 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 163 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 164 + ++ (optional buildPlatform.isDarwin gnused) 162 165 ; 163 166 164 167 # For building runtime libs ··· 177 180 targetPackages.stdenv.cc.bintools # For linking code at run-time 178 181 ] ++ (optional (isl != null) isl) 179 182 ++ (optional (zlib != null) zlib) 180 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 181 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 182 - ++ (optional hostPlatform.isDarwin gnused) 183 183 ; 184 184 185 185 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+4 -4
pkgs/development/compilers/gcc/11/default.nix
··· 33 33 assert libelf != null -> zlib != null; 34 34 35 35 # Make sure we get GNU sed. 36 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 36 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 37 37 38 38 # The go frontend is written in c++ 39 39 assert langGo -> langCC; ··· 167 167 nativeBuildInputs = [ texinfo which gettext ] 168 168 ++ (optional (perl != null) perl) 169 169 ++ (optional langAda gnatboot) 170 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 171 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 172 + ++ (optional buildPlatform.isDarwin gnused) 170 173 ; 171 174 172 175 # For building runtime libs ··· 185 188 targetPackages.stdenv.cc.bintools # For linking code at run-time 186 189 ] ++ (optional (isl != null) isl) 187 190 ++ (optional (zlib != null) zlib) 188 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 189 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 190 - ++ (optional hostPlatform.isDarwin gnused) 191 191 ; 192 192 193 193 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+4 -4
pkgs/development/compilers/gcc/12/default.nix
··· 33 33 assert libelf != null -> zlib != null; 34 34 35 35 # Make sure we get GNU sed. 36 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 36 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 37 37 38 38 # The go frontend is written in c++ 39 39 assert langGo -> langCC; ··· 162 162 nativeBuildInputs = [ texinfo which gettext ] 163 163 ++ (optional (perl != null) perl) 164 164 ++ (optional langAda gnatboot) 165 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 166 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 167 + ++ (optional buildPlatform.isDarwin gnused) 165 168 ; 166 169 167 170 # For building runtime libs ··· 180 183 targetPackages.stdenv.cc.bintools # For linking code at run-time 181 184 ] ++ (optional (isl != null) isl) 182 185 ++ (optional (zlib != null) zlib) 183 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 184 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 185 - ++ (optional hostPlatform.isDarwin gnused) 186 186 ; 187 187 188 188 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+6 -5
pkgs/development/compilers/gcc/4.8/default.nix
··· 43 43 assert libelf != null -> zlib != null; 44 44 45 45 # Make sure we get GNU sed. 46 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 46 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 47 47 48 48 # The go frontend is written in c++ 49 49 assert langGo -> langCC; ··· 165 165 depsBuildBuild = [ buildPackages.stdenv.cc ]; 166 166 nativeBuildInputs = [ texinfo which gettext ] 167 167 ++ (optional (perl != null) perl) 168 - ++ (optional javaAwtGtk pkg-config); 168 + ++ (optional javaAwtGtk pkg-config) 169 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 170 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 171 + ++ (optional buildPlatform.isDarwin gnused) 172 + ; 169 173 170 174 # For building runtime libs 171 175 depsBuildTarget = ··· 186 190 ++ (optional (zlib != null) zlib) 187 191 ++ (optionals langJava [ boehmgc zip unzip ]) 188 192 ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) 189 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 190 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 191 - ++ (optional hostPlatform.isDarwin gnused) 192 193 ; 193 194 194 195 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+6 -5
pkgs/development/compilers/gcc/4.9/default.nix
··· 43 43 assert libelf != null -> zlib != null; 44 44 45 45 # Make sure we get GNU sed. 46 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 46 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 47 47 48 48 # The go frontend is written in c++ 49 49 assert langGo -> langCC; ··· 185 185 depsBuildBuild = [ buildPackages.stdenv.cc ]; 186 186 nativeBuildInputs = [ texinfo which gettext ] 187 187 ++ (optional (perl != null) perl) 188 - ++ (optional javaAwtGtk pkg-config); 188 + ++ (optional javaAwtGtk pkg-config) 189 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 190 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 191 + ++ (optional buildPlatform.isDarwin gnused) 192 + ; 189 193 190 194 # For building runtime libs 191 195 depsBuildTarget = ··· 206 210 ++ (optional (zlib != null) zlib) 207 211 ++ (optionals langJava [ boehmgc zip unzip ]) 208 212 ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) 209 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 210 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 211 - ++ (optional hostPlatform.isDarwin gnused) 212 213 ; 213 214 214 215 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+4 -4
pkgs/development/compilers/gcc/6/default.nix
··· 44 44 assert libelf != null -> zlib != null; 45 45 46 46 # Make sure we get GNU sed. 47 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 47 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 48 48 49 49 # The go frontend is written in c++ 50 50 assert langGo -> langCC; ··· 196 196 ++ (optional javaAwtGtk pkg-config) 197 197 ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex) 198 198 ++ (optional langAda gnatboot) 199 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 200 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 201 + ++ (optional buildPlatform.isDarwin gnused) 199 202 ; 200 203 201 204 # For building runtime libs ··· 216 219 ++ (optional (zlib != null) zlib) 217 220 ++ (optionals langJava [ boehmgc zip unzip ]) 218 221 ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) 219 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 220 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 221 - ++ (optional hostPlatform.isDarwin gnused) 222 222 ; 223 223 224 224 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+6 -5
pkgs/development/compilers/gcc/7/default.nix
··· 30 30 assert libelf != null -> zlib != null; 31 31 32 32 # Make sure we get GNU sed. 33 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 33 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 34 34 35 35 # The go frontend is written in c++ 36 36 assert langGo -> langCC; ··· 164 164 165 165 depsBuildBuild = [ buildPackages.stdenv.cc ]; 166 166 nativeBuildInputs = [ texinfo which gettext ] 167 - ++ (optional (perl != null) perl); 167 + ++ (optional (perl != null) perl) 168 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 169 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 170 + ++ (optional buildPlatform.isDarwin gnused) 171 + ; 168 172 169 173 # For building runtime libs 170 174 depsBuildTarget = ··· 182 186 targetPackages.stdenv.cc.bintools # For linking code at run-time 183 187 ] ++ (optional (isl != null) isl) 184 188 ++ (optional (zlib != null) zlib) 185 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 186 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 187 - ++ (optional hostPlatform.isDarwin gnused) 188 189 ; 189 190 190 191 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+6 -5
pkgs/development/compilers/gcc/8/default.nix
··· 30 30 assert libelf != null -> zlib != null; 31 31 32 32 # Make sure we get GNU sed. 33 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 33 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 34 34 35 35 # The go frontend is written in c++ 36 36 assert langGo -> langCC; ··· 148 148 149 149 depsBuildBuild = [ buildPackages.stdenv.cc ]; 150 150 nativeBuildInputs = [ texinfo which gettext ] 151 - ++ (optional (perl != null) perl); 151 + ++ (optional (perl != null) perl) 152 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 153 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 154 + ++ (optional buildPlatform.isDarwin gnused) 155 + ; 152 156 153 157 # For building runtime libs 154 158 depsBuildTarget = ··· 166 170 targetPackages.stdenv.cc.bintools # For linking code at run-time 167 171 ] ++ (optional (isl != null) isl) 168 172 ++ (optional (zlib != null) zlib) 169 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 170 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 171 - ++ (optional hostPlatform.isDarwin gnused) 172 173 ; 173 174 174 175 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+4 -4
pkgs/development/compilers/gcc/9/default.nix
··· 38 38 assert libelf != null -> zlib != null; 39 39 40 40 # Make sure we get GNU sed. 41 - assert stdenv.hostPlatform.isDarwin -> gnused != null; 41 + assert stdenv.buildPlatform.isDarwin -> gnused != null; 42 42 43 43 # The go frontend is written in c++ 44 44 assert langGo -> langCC; ··· 161 161 nativeBuildInputs = [ texinfo which gettext ] 162 162 ++ (optional (perl != null) perl) 163 163 ++ (optional langAda gnatboot) 164 + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 165 + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 166 + ++ (optional buildPlatform.isDarwin gnused) 164 167 ; 165 168 166 169 # For building runtime libs ··· 179 182 targetPackages.stdenv.cc.bintools # For linking code at run-time 180 183 ] ++ (optional (isl != null) isl) 181 184 ++ (optional (zlib != null) zlib) 182 - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with 183 - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. 184 - ++ (optional hostPlatform.isDarwin gnused) 185 185 ; 186 186 187 187 depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;