darwin: remove -arch from cc/ld wrapper
`-arch` in the cc/ld wrapper causes problems when specifying different `--target` options, which would succeed except for the conflicting `-arch` specifier. Revertsfc0456bed1andb26e0bac8d
This commit is contained in:
@@ -343,10 +343,6 @@ stdenvNoCC.mkDerivation {
|
||||
done
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isDarwin ''
|
||||
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
|
||||
''
|
||||
|
||||
##
|
||||
## GNU specific extra strip flags
|
||||
##
|
||||
|
||||
@@ -696,10 +696,6 @@ stdenvNoCC.mkDerivation {
|
||||
done
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isDarwin ''
|
||||
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isAndroid ''
|
||||
echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
||||
Reference in New Issue
Block a user