summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-17 20:23:22 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-17 20:23:22 (GMT)
commit5fe5ad497b285e93ff7d3efc929e8f2ac88b779e (patch)
treef8a84eb08178b3dcc575b0a333292b99a5a045db /macosx
parent7a34b9758d4b12921a0380938c3e780e53760331 (diff)
parent4ce715f36aa76db649754d59c735144551d9aac5 (diff)
downloadtcl-5fe5ad497b285e93ff7d3efc929e8f2ac88b779e.zip
tcl-5fe5ad497b285e93ff7d3efc929e8f2ac88b779e.tar.gz
tcl-5fe5ad497b285e93ff7d3efc929e8f2ac88b779e.tar.bz2
Merge 9.0
Diffstat (limited to 'macosx')
-rw-r--r--macosx/README4
-rw-r--r--macosx/Tcl.xcodeproj/project.pbxproj10
2 files changed, 7 insertions, 7 deletions
diff --git a/macosx/README b/macosx/README
index c1f9e87..ee1b7ea 100644
--- a/macosx/README
+++ b/macosx/README
@@ -113,7 +113,7 @@ your ${USER}.pbxuser file (located inside the Tcl.xcodeproj bundle directory)
with a text editor.
- To build universal binaries outside of the Xcode IDE, set CFLAGS as follows:
- export CFLAGS="-arch x86_64 -arch arm64e"
+ export CFLAGS="-arch x86_64 -arch arm64"
This requires Mac OS X 10.6 and Xcode 10.2 and will work on any architecture.
Note that configure requires CFLAGS to contain a least one architecture that can
be run on the build machine (i.e. x86_64 on Core2/Xeon).
@@ -133,7 +133,7 @@ If you are building from CVS, omit this step (CVS source tree names usually do
not contain a version number).
- Setup environment variables as desired, e.g. for a universal build on 10.5:
- CFLAGS="-arch x86_64 -arch arm64e -mmacosx-version-min=10.5"
+ CFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.5"
export CFLAGS
- Change to the directory containing the Tcl source tree and build:
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index 872a8cd..fc00f74 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -2122,7 +2122,7 @@
baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+ CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PREBINDING = NO;
};
@@ -2507,7 +2507,7 @@
baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+ CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
GCC_VERSION = 4.0;
MACOSX_DEPLOYMENT_TARGET = 10.6;
PREBINDING = NO;
@@ -2545,7 +2545,7 @@
baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+ CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
DEBUG_INFORMATION_FORMAT = dwarf;
GCC = "llvm-gcc";
GCC_OPTIMIZATION_LEVEL = 4;
@@ -2685,7 +2685,7 @@
ARCHS = (
"$(NATIVE_ARCH_64_BIT)",
);
- CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+ CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
DEBUG_INFORMATION_FORMAT = dwarf;
GCC = clang;
GCC_OPTIMIZATION_LEVEL = 4;
@@ -2752,7 +2752,7 @@
baseConfigurationReference = F97AE82B0B65C69B00310EA2 /* Tcl-Release.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CFLAGS = "-arch x86_64 -arch arm64e $(CFLAGS)";
+ CFLAGS = "-arch x86_64 -arch arm64 $(CFLAGS)";
CPPFLAGS = "-isysroot $(SDKROOT) $(CPPFLAGS)";
MACOSX_DEPLOYMENT_TARGET = 10.5;
PREBINDING = NO;