Remove -nostdlibinc flag from clang when building for android-prebuilt (#389028)

alexfmpe · web-flow · commit c00afdff9de5 · 2025-04-30T03:40:25.000+01:00
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
@@ -745,7 +745,7 @@ stdenvNoCC.mkDerivation {
     # no `/usr/include`, there’s essentially no risk to dropping
     # the flag there. See discussion in NixOS/nixpkgs#191152.
     #
-    + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin) ''
+    + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin && !targetPlatform.isAndroid) ''
       echo " -nostdlibinc" >> $out/nix-support/cc-cflags
     ''
 

Original file line number	Diff line number	Diff line change
`@@ -745,7 +745,7 @@ stdenvNoCC.mkDerivation {`
`745`	`745`	# no `/usr/include`, there’s essentially no risk to dropping
`746`	`746`	`# the flag there. See discussion in NixOS/nixpkgs#191152.`
`747`	`747`	`#`
`748`		`- + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin) ''`
	`748`	`+ + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin && !targetPlatform.isAndroid) ''`
`749`	`749`	`echo " -nostdlibinc" >> $out/nix-support/cc-cflags`
`750`	`750`	`''`
`751`	`751`