tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
Merge pull request #192459 from danielfullmer/fix-cc-wrapper-libdir
+3
-1
+3
-1
pkgs/build-support/cc-wrapper/default.nix
+3
-1
pkgs/build-support/cc-wrapper/default.nix
···
107
107
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false)
108
108
&& !(stdenv.targetPlatform.isiOS or false)
109
109
&& gccForLibs != null;
110
+
gccForLibs_solib = getLib gccForLibs
111
+
+ optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";
110
112
111
113
# older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu
112
114
isGccArchSupported = arch:
···
376
374
''
377
375
+ optionalString useGccForLibs ''
378
376
echo "-L${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-ldflags
379
-
echo "-L${gccForLibs.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags
377
+
echo "-L${gccForLibs_solib}/lib" >> $out/nix-support/cc-ldflags
380
378
''
381
379
382
380
# TODO We would like to connect this to `useGccForLibs`, but we cannot yet