Title: [288606] trunk/Source/WebGPU
- Revision
- 288606
- Author
- [email protected]
- Date
- 2022-01-25 23:54:20 -0800 (Tue, 25 Jan 2022)
Log Message
[WebGPU] Fix WGSLUnitTests build
https://bugs.webkit.org/show_bug.cgi?id=235628
Unreviewed.
* Configurations/WGSLUnitTests.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebGPU/ChangeLog (288605 => 288606)
--- trunk/Source/WebGPU/ChangeLog 2022-01-26 07:00:15 UTC (rev 288605)
+++ trunk/Source/WebGPU/ChangeLog 2022-01-26 07:54:20 UTC (rev 288606)
@@ -1,15 +1,12 @@
2022-01-25 Myles C. Maxfield <[email protected]>
- [WebGPU] Build fix for Mac Catalyst
- https://bugs.webkit.org/show_bug.cgi?id=235625
+ [WebGPU] Fix WGSLUnitTests build
+ https://bugs.webkit.org/show_bug.cgi?id=235628
Unreviewed.
- The WGSL headers and .a file for Mac Catalyst need to not collide with the same files for regular Mac builds.
+ * Configurations/WGSLUnitTests.xcconfig:
- * Configurations/Base.xcconfig:
- * Configurations/WGSL.xcconfig:
-
2022-01-18 Alex Christensen <[email protected]>
Use c++2a instead of gnu++2a for Cocoa builds
Modified: trunk/Source/WebGPU/Configurations/Base.xcconfig (288605 => 288606)
--- trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-01-26 07:00:15 UTC (rev 288605)
+++ trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-01-26 07:54:20 UTC (rev 288606)
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2022 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2021 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,7 +163,3 @@
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 (288605 => 288606)
--- trunk/Source/WebGPU/Configurations/WGSL.xcconfig 2022-01-26 07:00:15 UTC (rev 288605)
+++ trunk/Source/WebGPU/Configurations/WGSL.xcconfig 2022-01-26 07:54:20 UTC (rev 288606)
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2022 Apple Inc. All rights reserved.
+// Copyright (C) 2014-2021 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,8 +22,5 @@
// 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;
Modified: trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig (288605 => 288606)
--- trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig 2022-01-26 07:00:15 UTC (rev 288605)
+++ trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig 2022-01-26 07:54:20 UTC (rev 288606)
@@ -21,7 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-EXECUTABLE_PREFIX = lib;
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
PRODUCT_NAME = WGSLUnitTests;
ENABLE_TESTABILITY = YES;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
