gcc, glibc: merge changes from original multiple-output
Can't be done automatically because of file copies/moves.
This commit is contained in:
@@ -195,7 +195,7 @@ let version = "4.8.3";
|
||||
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
|
||||
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
|
||||
|
||||
bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
|
||||
bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
|
||||
|
||||
in
|
||||
|
||||
@@ -214,6 +214,13 @@ stdenv.mkDerivation ({
|
||||
|
||||
inherit patches;
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
setOutputConfigureFlags = false;
|
||||
|
||||
|
||||
libc_dev = stdenv.gcc.libc_dev;
|
||||
|
||||
postPatch =
|
||||
if (stdenv.isGNU
|
||||
|| (libcCross != null # e.g., building `gcc.crossDrv'
|
||||
|
||||
Reference in New Issue
Block a user