Title: [288607] trunk/Source/WebGPU
- Revision
- 288607
- Author
- [email protected]
- Date
- 2022-01-25 23:58:17 -0800 (Tue, 25 Jan 2022)
Log Message
Unreviewed, reverting r288606.
https://bugs.webkit.org/show_bug.cgi?id=235629
Should never have been committed
Reverted changeset:
"[WebGPU] Fix WGSLUnitTests build"
https://bugs.webkit.org/show_bug.cgi?id=235628
https://commits.webkit.org/r288606
Patch by Commit Queue <[email protected]> on 2022-01-25
Modified Paths
Diff
Modified: trunk/Source/WebGPU/ChangeLog (288606 => 288607)
--- trunk/Source/WebGPU/ChangeLog 2022-01-26 07:54:20 UTC (rev 288606)
+++ trunk/Source/WebGPU/ChangeLog 2022-01-26 07:58:17 UTC (rev 288607)
@@ -1,3 +1,16 @@
+2022-01-25 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r288606.
+ https://bugs.webkit.org/show_bug.cgi?id=235629
+
+ Should never have been committed
+
+ Reverted changeset:
+
+ "[WebGPU] Fix WGSLUnitTests build"
+ https://bugs.webkit.org/show_bug.cgi?id=235628
+ https://commits.webkit.org/r288606
+
2022-01-25 Myles C. Maxfield <[email protected]>
[WebGPU] Fix WGSLUnitTests build
Modified: trunk/Source/WebGPU/Configurations/Base.xcconfig (288606 => 288607)
--- trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-01-26 07:54:20 UTC (rev 288606)
+++ trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-01-26 07:58:17 UTC (rev 288607)
@@ -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 (288606 => 288607)
--- trunk/Source/WebGPU/Configurations/WGSL.xcconfig 2022-01-26 07:54:20 UTC (rev 288606)
+++ trunk/Source/WebGPU/Configurations/WGSL.xcconfig 2022-01-26 07:58:17 UTC (rev 288607)
@@ -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;
Modified: trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig (288606 => 288607)
--- trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig 2022-01-26 07:54:20 UTC (rev 288606)
+++ trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig 2022-01-26 07:58:17 UTC (rev 288607)
@@ -21,6 +21,7 @@
// (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
