-
Notifications
You must be signed in to change notification settings - Fork 164
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cmake: Don't add additional -arch flags on Darwin.
Fixes building on arm64 in an x86_64 chroot where it would append "-arch x86_64" and then fail to link. schmonz verified that this change doesn't seem to affect non-chroot native builds.
- Loading branch information
Showing
2 changed files
with
17 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
$NetBSD: patch-Source_cmLocalGenerator.cxx,v 1.1 2021/07/15 21:10:53 jperkin Exp $ | ||
|
||
Disable additional -arch flags on macOS. | ||
|
||
--- Source/cmLocalGenerator.cxx.orig 2021-06-21 15:23:19.000000000 +0000 | ||
+++ Source/cmLocalGenerator.cxx | ||
@@ -97,7 +97,7 @@ cmLocalGenerator::cmLocalGenerator(cmGlo | ||
|
||
this->AliasTargets = makefile->GetAliasTargets(); | ||
|
||
- this->EmitUniversalBinaryFlags = true; | ||
+ this->EmitUniversalBinaryFlags = false; | ||
this->BackwardsCompatibility = 0; | ||
this->BackwardsCompatibilityFinal = false; | ||
|