Remove -nostdlibinc flag from clang when building for android

alexfmpe · alexfmpe · commit 1c36dd2a3527 · 2025-03-11T17:18:37.000Z
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
@@ -646,7 +646,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
`@@ -646,7 +646,7 @@ stdenvNoCC.mkDerivation {`
`646`	`646`	# no `/usr/include`, there’s essentially no risk to dropping
`647`	`647`	`# the flag there. See discussion in NixOS/nixpkgs#191152.`
`648`	`648`	`#`
`649`		`- + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin) ''`
	`649`	`+ + optionalString ((cc.isClang or false) && !(cc.isROCm or false) && !targetPlatform.isDarwin && !targetPlatform.isAndroid) ''`
`650`	`650`	`echo " -nostdlibinc" >> $out/nix-support/cc-cflags`
`651`	`651`	`''`
`652`	`652`