[WebGPU] Build fix for Mac Catalyst
https://bugs.webkit.org/show_bug.cgi?id=235625
Unreviewed.
The WGSL headers and .a file for Mac Catalyst need to not collide with the same files for regular Mac builds.
* Configurations/Base.xcconfig:
* Configurations/WGSL.xcconfig:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@288603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebGPU/ChangeLog b/Source/WebGPU/ChangeLog
index 80970ea..a53ccb1 100644
--- a/Source/WebGPU/ChangeLog
+++ b/Source/WebGPU/ChangeLog
@@ -1,3 +1,15 @@
+2022-01-25 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [WebGPU] Build fix for Mac Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=235625
+
+ Unreviewed.
+
+ The WGSL headers and .a file for Mac Catalyst need to not collide with the same files for regular Mac builds.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WGSL.xcconfig:
+
2022-01-18 Alex Christensen <achristensen@webkit.org>
Use c++2a instead of gnu++2a for Cocoa builds
diff --git a/Source/WebGPU/Configurations/Base.xcconfig b/Source/WebGPU/Configurations/Base.xcconfig
index 5a61bc7..2b30a69 100644
--- a/Source/WebGPU/Configurations/Base.xcconfig
+++ b/Source/WebGPU/Configurations/Base.xcconfig
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2021 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2022 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -163,3 +163,7 @@
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_thin);
NORMAL_WEBGPU_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+
+WGSL_INSTALL_PATH_PREFIX = $(WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
+WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
diff --git a/Source/WebGPU/Configurations/WGSL.xcconfig b/Source/WebGPU/Configurations/WGSL.xcconfig
index df900ec..b665fe3 100644
--- a/Source/WebGPU/Configurations/WGSL.xcconfig
+++ b/Source/WebGPU/Configurations/WGSL.xcconfig
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2021 Apple Inc. All rights reserved.
+// Copyright (C) 2014-2022 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -22,5 +22,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
+INSTALL_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/lib;
+PRIVATE_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/include;
+PUBLIC_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/include;
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
PRODUCT_NAME = wgsl;
