@@ -403,12 +403,12 @@ protected CppConfiguration(CppConfigurationParameters params)
403
403
404
404
this .toolchainIdentifier = toolchain .getToolchainIdentifier ();
405
405
406
+ this .supportsEmbeddedRuntimes = toolchain .getSupportsEmbeddedRuntimes ();
406
407
toolchain = addLegacyFeatures (toolchain );
407
408
this .toolchainFeatures = new CcToolchainFeatures (toolchain );
408
409
this .supportsGoldLinker = toolchain .getSupportsGoldLinker ();
409
410
this .supportsStartEndLib = toolchain .getSupportsStartEndLib ();
410
411
this .supportsInterfaceSharedObjects = toolchain .getSupportsInterfaceSharedObjects ();
411
- this .supportsEmbeddedRuntimes = toolchain .getSupportsEmbeddedRuntimes ();
412
412
this .supportsFission = toolchain .getSupportsFission ();
413
413
this .toolchainNeedsPic = toolchain .getNeedsPic ();
414
414
this .usePicForBinaries =
@@ -727,12 +727,12 @@ private CToolchain addLegacyFeatures(CToolchain toolchain) {
727
727
if (getTargetLibc ().equals ("macosx" )) {
728
728
TextFormat .merge (
729
729
CppLinkActionConfigs .getCppLinkActionConfigs (
730
- CppLinkPlatform .MAC , features , linkerToolPath ),
730
+ CppLinkPlatform .MAC , features , linkerToolPath , supportsEmbeddedRuntimes ),
731
731
toolchainBuilder );
732
732
} else {
733
733
TextFormat .merge (
734
734
CppLinkActionConfigs .getCppLinkActionConfigs (
735
- CppLinkPlatform .LINUX , features , linkerToolPath ),
735
+ CppLinkPlatform .LINUX , features , linkerToolPath , supportsEmbeddedRuntimes ),
736
736
toolchainBuilder );
737
737
}
738
738
}
0 commit comments