Merge pull request #74065 from Ericson2314/cc-versions

compilers, binutils: Add version and pname
This commit is contained in:
John Ericson
2019-11-24 18:35:13 -05:00
committed by GitHub
23 changed files with 60 additions and 40 deletions
+3 -3
View File
@@ -93,9 +93,9 @@ assert nativeLibc == bintools.nativeLibc;
assert nativePrefix == bintools.nativePrefix;
stdenv.mkDerivation {
name = targetPrefix
+ (if name != "" then name else "${ccName}-wrapper")
+ (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}");
pname = targetPrefix
+ (if name != "" then name else "${ccName}-wrapper");
version = if cc == null then null else ccVersion;
preferLocalBuild = true;