File tree 1 file changed +3
-3
lines changed
1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -454,17 +454,17 @@ let
454
454
# See also https://gitlab.haskell.org/ghc/ghc/-/issues/12935
455
455
( if contentAddressed then ''
456
456
runHook preBuild
457
- $SETUP_HS build ${ haskellLib . componentTarget componentId } -j1 ${ lib . concatStringsSep " " setupBuildFlags }
457
+ $SETUP_HS build ${ haskellLib . componentTarget componentId } -j1 ${ lib . concatStringsSep " " ( component . setupBuildFlags ++ setupBuildFlags ) }
458
458
runHook postBuild
459
459
'' else if stdenv . hostPlatform . isGhcjs then ''
460
460
runHook preBuild
461
461
# https://gitlab.haskell.org/ghc/ghc/issues/9221
462
- $SETUP_HS build ${ haskellLib . componentTarget componentId } ${ lib . concatStringsSep " " setupBuildFlags }
462
+ $SETUP_HS build ${ haskellLib . componentTarget componentId } ${ lib . concatStringsSep " " ( component . setupBuildFlags ++ setupBuildFlags ) }
463
463
runHook postBuild
464
464
'' else ''
465
465
runHook preBuild
466
466
# https://gitlab.haskell.org/ghc/ghc/issues/9221
467
- $SETUP_HS build ${ haskellLib . componentTarget componentId } -j$(($NIX_BUILD_CORES > 4 ? 4 : $NIX_BUILD_CORES)) ${ lib . concatStringsSep " " setupBuildFlags }
467
+ $SETUP_HS build ${ haskellLib . componentTarget componentId } -j$(($NIX_BUILD_CORES > 4 ? 4 : $NIX_BUILD_CORES)) ${ lib . concatStringsSep " " ( component . setupBuildFlags ++ setupBuildFlags ) }
468
468
runHook postBuild
469
469
'' ) ;
470
470
You can’t perform that action at this time.
0 commit comments