Skip to content

Commit b04d790

Browse files
committed
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.
1 parent 5eef413 commit b04d790

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

devel/cmake/distinfo

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.180 2021/06/24 09:30:55 adam Exp $
1+
$NetBSD: distinfo,v 1.181 2021/07/15 21:10:53 jperkin Exp $
22

33
SHA1 (cmake-3.20.5.tar.gz) = 42b43d0a5d82285384db8d17b5bd5dd9cc3fc6a2
44
RMD160 (cmake-3.20.5.tar.gz) = 8737df0ceeb6d3d8ec94a907d7fcf475a69feffc
@@ -19,5 +19,6 @@ SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac820
1919
SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
2020
SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
2121
SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 0858da256bba174694a165d5f910eedb3faa06d5
22+
SHA1 (patch-Source_cmLocalGenerator.cxx) = 7b41e5837c2dcff54114541920c45258632275b0
2223
SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
2324
SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
$NetBSD: patch-Source_cmLocalGenerator.cxx,v 1.1 2021/07/15 21:10:53 jperkin Exp $
2+
3+
Disable additional -arch flags on macOS.
4+
5+
--- Source/cmLocalGenerator.cxx.orig 2021-06-21 15:23:19.000000000 +0000
6+
+++ Source/cmLocalGenerator.cxx
7+
@@ -97,7 +97,7 @@ cmLocalGenerator::cmLocalGenerator(cmGlo
8+
9+
this->AliasTargets = makefile->GetAliasTargets();
10+
11+
- this->EmitUniversalBinaryFlags = true;
12+
+ this->EmitUniversalBinaryFlags = false;
13+
this->BackwardsCompatibility = 0;
14+
this->BackwardsCompatibilityFinal = false;
15+

0 commit comments

Comments
 (0)