|
|
|
@ -7610,6 +7610,7 @@ in |
|
|
|
|
}; |
|
|
|
|
bintools = binutils1; |
|
|
|
|
libc = libcCross1; |
|
|
|
|
extraPackages = []; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { |
|
|
|
@ -7619,6 +7620,7 @@ in |
|
|
|
|
profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64)); |
|
|
|
|
|
|
|
|
|
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; |
|
|
|
|
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; |
|
|
|
|
|
|
|
|
|
isl = if !stdenv.isDarwin then isl_0_14 else null; |
|
|
|
|
cloog = if !stdenv.isDarwin then cloog else null; |
|
|
|
@ -7632,6 +7634,7 @@ in |
|
|
|
|
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); |
|
|
|
|
|
|
|
|
|
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; |
|
|
|
|
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; |
|
|
|
|
|
|
|
|
|
isl = if !stdenv.isDarwin then isl_0_11 else null; |
|
|
|
|
|
|
|
|
@ -7645,6 +7648,7 @@ in |
|
|
|
|
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); |
|
|
|
|
|
|
|
|
|
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; |
|
|
|
|
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; |
|
|
|
|
|
|
|
|
|
isl = if !stdenv.isDarwin then isl_0_14 else null; |
|
|
|
|
})); |
|
|
|
@ -7656,6 +7660,7 @@ in |
|
|
|
|
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); |
|
|
|
|
|
|
|
|
|
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; |
|
|
|
|
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; |
|
|
|
|
|
|
|
|
|
isl = if !stdenv.isDarwin then isl_0_14 else null; |
|
|
|
|
})); |
|
|
|
@ -7667,6 +7672,7 @@ in |
|
|
|
|
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); |
|
|
|
|
|
|
|
|
|
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; |
|
|
|
|
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; |
|
|
|
|
|
|
|
|
|
isl = if !stdenv.isDarwin then isl_0_17 else null; |
|
|
|
|
})); |
|
|
|
@ -7678,6 +7684,7 @@ in |
|
|
|
|
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); |
|
|
|
|
|
|
|
|
|
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; |
|
|
|
|
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; |
|
|
|
|
|
|
|
|
|
isl = if !stdenv.isDarwin then isl_0_17 else null; |
|
|
|
|
})); |
|
|
|
@ -7689,6 +7696,7 @@ in |
|
|
|
|
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); |
|
|
|
|
|
|
|
|
|
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; |
|
|
|
|
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; |
|
|
|
|
|
|
|
|
|
isl = if !stdenv.isDarwin then isl_0_17 else null; |
|
|
|
|
})); |
|
|
|
@ -7700,6 +7708,7 @@ in |
|
|
|
|
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); |
|
|
|
|
|
|
|
|
|
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; |
|
|
|
|
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; |
|
|
|
|
|
|
|
|
|
isl = isl_0_17; |
|
|
|
|
})); |
|
|
|
@ -8497,6 +8506,7 @@ in |
|
|
|
|
# provide the default choice, avoiding infinite recursion. |
|
|
|
|
bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils |
|
|
|
|
, libc ? bintools.libc |
|
|
|
|
, extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross |
|
|
|
|
, ... |
|
|
|
|
} @ extraArgs: |
|
|
|
|
callPackage ../build-support/cc-wrapper (let self = { |
|
|
|
@ -8508,7 +8518,7 @@ in |
|
|
|
|
isGNU = cc.isGNU or false; |
|
|
|
|
isClang = cc.isClang or false; |
|
|
|
|
|
|
|
|
|
inherit cc bintools libc; |
|
|
|
|
inherit cc bintools libc extraPackages; |
|
|
|
|
} // extraArgs; in self); |
|
|
|
|
|
|
|
|
|
wrapCC = cc: wrapCCWith { |
|
|
|
@ -10973,6 +10983,11 @@ in |
|
|
|
|
|
|
|
|
|
libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; |
|
|
|
|
|
|
|
|
|
threadsCross = |
|
|
|
|
if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) |
|
|
|
|
then targetPackages.windows.mcfgthreads or windows.mcfgthreads |
|
|
|
|
else null; |
|
|
|
|
|
|
|
|
|
wasilibc = callPackage ../development/libraries/wasilibc { |
|
|
|
|
stdenv = crossLibcStdenv; |
|
|
|
|
}; |
|
|
|
|