Skip to content

Commit ba1a89a

Browse files
compnerdcompnerd
committed
Foundation: add new CPP definition for macOS
PR#4870 introduced a new CPP macro to allow building on non-threaded systems, but in the process regressed the macOS build. Add the requisite macro to enable the builds to function properly.
1 parent 5a1db79 commit ba1a89a

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

‎Foundation.xcodeproj/project.pbxproj

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3437,6 +3437,7 @@
34373437
"-DCF_BUILDING_CF",
34383438
"-DDEPLOYMENT_RUNTIME_SWIFT",
34393439
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
3440+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
34403441
"-I$(SRCROOT)/bootstrap/common/usr/include",
34413442
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
34423443
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -3478,6 +3479,7 @@
34783479
"-DCF_BUILDING_CF",
34793480
"-DDEPLOYMENT_RUNTIME_SWIFT",
34803481
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
3482+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
34813483
"-I$(SRCROOT)/bootstrap/common/usr/include",
34823484
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
34833485
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -3536,6 +3538,7 @@
35363538
"-DDEPLOYMENT_RUNTIME_SWIFT",
35373539
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
35383540
"-DHAVE_STRUCT_TIMESPEC",
3541+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
35393542
"-I$(SRCROOT)/bootstrap/common/usr/include",
35403543
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
35413544
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -3551,7 +3554,7 @@
35513554
"-Wno-int-conversion",
35523555
"-Wno-unused-function",
35533556
);
3554-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
3557+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS";
35553558
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.XML;
35563559
PRODUCT_NAME = "$(TARGET_NAME)";
35573560
SKIP_INSTALL = YES;
@@ -3592,6 +3595,7 @@
35923595
"-DDEPLOYMENT_RUNTIME_SWIFT",
35933596
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
35943597
"-DHAVE_STRUCT_TIMESPEC",
3598+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
35953599
"-I$(SRCROOT)/bootstrap/common/usr/include",
35963600
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
35973601
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -3607,7 +3611,7 @@
36073611
"-Wno-int-conversion",
36083612
"-Wno-unused-function",
36093613
);
3610-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
3614+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS";
36113615
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.XML;
36123616
PRODUCT_NAME = "$(TARGET_NAME)";
36133617
SKIP_INSTALL = YES;
@@ -3649,6 +3653,7 @@
36493653
"-DDEPLOYMENT_RUNTIME_SWIFT",
36503654
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
36513655
"-DHAVE_STRUCT_TIMESPEC",
3656+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
36523657
"-I$(SRCROOT)/bootstrap/common/usr/include",
36533658
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
36543659
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -3665,7 +3670,7 @@
36653670
"-Wno-unused-function",
36663671
);
36673672
OTHER_LDFLAGS = "-twolevel_namespace";
3668-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
3673+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS";
36693674
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.Networking;
36703675
PRODUCT_NAME = "$(TARGET_NAME)";
36713676
SKIP_INSTALL = YES;
@@ -3709,6 +3714,7 @@
37093714
"-DDEPLOYMENT_RUNTIME_SWIFT",
37103715
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
37113716
"-DHAVE_STRUCT_TIMESPEC",
3717+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
37123718
"-I$(SRCROOT)/bootstrap/common/usr/include",
37133719
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
37143720
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -3725,7 +3731,7 @@
37253731
"-Wno-unused-function",
37263732
);
37273733
OTHER_LDFLAGS = "-twolevel_namespace";
3728-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
3734+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS";
37293735
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.Networking;
37303736
PRODUCT_NAME = "$(TARGET_NAME)";
37313737
SKIP_INSTALL = YES;
@@ -3749,6 +3755,7 @@
37493755
"-DCF_BUILDING_CF",
37503756
"-DDEPLOYMENT_RUNTIME_SWIFT",
37513757
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
3758+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
37523759
"-I$(SRCROOT)/bootstrap/common/usr/include",
37533760
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
37543761
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -3790,6 +3797,7 @@
37903797
"-DCF_BUILDING_CF",
37913798
"-DDEPLOYMENT_RUNTIME_SWIFT",
37923799
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
3800+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
37933801
"-I$(SRCROOT)/bootstrap/common/usr/include",
37943802
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
37953803
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -3967,6 +3975,7 @@
39673975
"-DDEPLOYMENT_RUNTIME_SWIFT",
39683976
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
39693977
"-DHAVE_STRUCT_TIMESPEC",
3978+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
39703979
"-I$(SRCROOT)/bootstrap/common/usr/include",
39713980
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
39723981
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -4002,7 +4011,7 @@
40024011
r,
40034012
r,
40044013
);
4005-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
4014+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS";
40064015
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation;
40074016
PRODUCT_NAME = "$(TARGET_NAME)";
40084017
SKIP_INSTALL = YES;
@@ -4044,6 +4053,7 @@
40444053
"-DDEPLOYMENT_RUNTIME_SWIFT",
40454054
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
40464055
"-DHAVE_STRUCT_TIMESPEC",
4056+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
40474057
"-I$(SRCROOT)/bootstrap/common/usr/include",
40484058
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
40494059
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -4080,7 +4090,7 @@
40804090
r,
40814091
r,
40824092
);
4083-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
4093+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS";
40844094
PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation;
40854095
PRODUCT_NAME = "$(TARGET_NAME)";
40864096
SKIP_INSTALL = YES;
@@ -4110,6 +4120,7 @@
41104120
"-DCF_BUILDING_CF",
41114121
"-DDEPLOYMENT_RUNTIME_SWIFT",
41124122
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
4123+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
41134124
"-I$(SRCROOT)/bootstrap/common/usr/include",
41144125
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
41154126
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -4159,6 +4170,7 @@
41594170
"-DCF_BUILDING_CF",
41604171
"-DDEPLOYMENT_RUNTIME_SWIFT",
41614172
"-DDEPLOYMENT_ENABLE_LIBDISPATCH",
4173+
"-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS",
41624174
"-I$(SRCROOT)/bootstrap/common/usr/include",
41634175
"-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include",
41644176
"-I$(SRCROOT)/bootstrap/common/usr/local/include",
@@ -4207,7 +4219,7 @@
42074219
);
42084220
LIBRARY_SEARCH_PATHS = "$(inherited)";
42094221
MACH_O_TYPE = mh_execute;
4210-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
4222+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS";
42114223
PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation;
42124224
PRODUCT_NAME = "$(TARGET_NAME)";
42134225
SKIP_INSTALL = YES;
@@ -4237,7 +4249,7 @@
42374249
);
42384250
LIBRARY_SEARCH_PATHS = "$(inherited)";
42394251
MACH_O_TYPE = mh_execute;
4240-
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT";
4252+
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS";
42414253
PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation;
42424254
PRODUCT_NAME = "$(TARGET_NAME)";
42434255
SKIP_INSTALL = YES;

0 commit comments

Comments
 (0)