diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 346a7d64222f..d0e91615eb62 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -106,7 +106,7 @@ let versionAtLeast ; - inherit (stdenvNoCC) hostPlatform targetPlatform; + inherit (stdenvNoCC) buildPlatform hostPlatform targetPlatform; includeFortifyHeaders' = if includeFortifyHeaders != null then @@ -445,6 +445,13 @@ stdenvNoCC.mkDerivation { inherit nixSupport; inherit defaultHardeningFlags; + } + // optionalAttrs cc.langGo or false { + # So gccgo looks more like go for buildGoModule + + inherit (targetPlatform.go) GOOS GOARCH GOARM; + + CGO_ENABLED = 1; }; dontBuild = true; @@ -873,6 +880,9 @@ stdenvNoCC.mkDerivation { + optionalString cc.langFortran or false '' hardening_unsupported_flags+=" format" '' + + optionalString cc.langGo or false '' + hardening_unsupported_flags+=" format" + '' + optionalString targetPlatform.isWasm '' hardening_unsupported_flags+=" stackprotector fortify pie pic" ''