From ba1a89aeba23a614f0ce8bae86fdb48190348653 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Wed, 28 Feb 2024 07:59:57 -0800 Subject: [PATCH] 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. --- Foundation.xcodeproj/project.pbxproj | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/Foundation.xcodeproj/project.pbxproj b/Foundation.xcodeproj/project.pbxproj index 2e6436d971..0693a2ae75 100644 --- a/Foundation.xcodeproj/project.pbxproj +++ b/Foundation.xcodeproj/project.pbxproj @@ -3437,6 +3437,7 @@ "-DCF_BUILDING_CF", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -3478,6 +3479,7 @@ "-DCF_BUILDING_CF", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -3536,6 +3538,7 @@ "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-DHAVE_STRUCT_TIMESPEC", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -3551,7 +3554,7 @@ "-Wno-int-conversion", "-Wno-unused-function", ); - OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT"; + OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"; PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.XML; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -3592,6 +3595,7 @@ "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-DHAVE_STRUCT_TIMESPEC", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -3607,7 +3611,7 @@ "-Wno-int-conversion", "-Wno-unused-function", ); - OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT"; + OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"; PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.XML; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -3649,6 +3653,7 @@ "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-DHAVE_STRUCT_TIMESPEC", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -3665,7 +3670,7 @@ "-Wno-unused-function", ); OTHER_LDFLAGS = "-twolevel_namespace"; - OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT"; + OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"; PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.Networking; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -3709,6 +3714,7 @@ "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-DHAVE_STRUCT_TIMESPEC", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -3725,7 +3731,7 @@ "-Wno-unused-function", ); OTHER_LDFLAGS = "-twolevel_namespace"; - OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT"; + OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"; PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation.Networking; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -3749,6 +3755,7 @@ "-DCF_BUILDING_CF", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -3790,6 +3797,7 @@ "-DCF_BUILDING_CF", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -3967,6 +3975,7 @@ "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-DHAVE_STRUCT_TIMESPEC", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -4002,7 +4011,7 @@ r, r, ); - OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT"; + OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"; PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -4044,6 +4053,7 @@ "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", "-DHAVE_STRUCT_TIMESPEC", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -4080,7 +4090,7 @@ r, r, ); - OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT"; + OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"; PRODUCT_BUNDLE_IDENTIFIER = org.swift.Foundation; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -4110,6 +4120,7 @@ "-DCF_BUILDING_CF", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -4159,6 +4170,7 @@ "-DCF_BUILDING_CF", "-DDEPLOYMENT_RUNTIME_SWIFT", "-DDEPLOYMENT_ENABLE_LIBDISPATCH", + "-DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS", "-I$(SRCROOT)/bootstrap/common/usr/include", "-I$(SRCROOT)/bootstrap/x86_64-apple-darwin/usr/include", "-I$(SRCROOT)/bootstrap/common/usr/local/include", @@ -4207,7 +4219,7 @@ ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MACH_O_TYPE = mh_execute; - OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT"; + OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"; PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -4237,7 +4249,7 @@ ); LIBRARY_SEARCH_PATHS = "$(inherited)"; MACH_O_TYPE = mh_execute; - OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT"; + OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -DDEPLOYMENT_RUNTIME_SWIFT -DSWIFT_CORELIBS_FOUNDATION_HAS_THREADS"; PRODUCT_BUNDLE_IDENTIFIER = org.swift.TestFoundation; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES;