Title: [288603] trunk/Source/WebGPU
- Revision
- 288603
- Author
- mmaxfi...@apple.com
- Date
- 2022-01-25 20:15:16 -0800 (Tue, 25 Jan 2022)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Source/WebGPU/ChangeLog (288602 => 288603)
--- trunk/Source/WebGPU/ChangeLog 2022-01-26 04:12:24 UTC (rev 288602)
+++ trunk/Source/WebGPU/ChangeLog 2022-01-26 04:15:16 UTC (rev 288603)
@@ -1,3 +1,15 @@
+2022-01-25 Myles C. Maxfield <mmaxfi...@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 <achristen...@webkit.org>
Use c++2a instead of gnu++2a for Cocoa builds
Modified: trunk/Source/WebGPU/Configurations/Base.xcconfig (288602 => 288603)
--- trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-01-26 04:12:24 UTC (rev 288602)
+++ trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-01-26 04:15:16 UTC (rev 288603)
@@ -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)/;
Modified: trunk/Source/WebGPU/Configurations/WGSL.xcconfig (288602 => 288603)
--- trunk/Source/WebGPU/Configurations/WGSL.xcconfig 2022-01-26 04:12:24 UTC (rev 288602)
+++ trunk/Source/WebGPU/Configurations/WGSL.xcconfig 2022-01-26 04:15:16 UTC (rev 288603)
@@ -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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
