mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-08-05 11:45:54 +00:00
c6be53e172
This reverts commit 61bc38fd52161ce7c0722a966eb4d66315b07cc1. Reason for revert: Appears to have broken the Dawn->Chromium autoroller, which is now seeing Abseil linking issues on Mac and Linux. Example failing roll: https://chromium-review.googlesource.com/c/chromium/src/+/3590451/ Example error log: https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket/8816532799903001889/+/u/compile__with_patch_/stdout Log Excerpt: [802/31819] LINK ./dawn_unittests FAILED: dawn_unittests TOOL_VERSION=1650247560 ../../build/toolchain/apple/linker_driver.py -Wcrl,strippath,../../build/mac_files/xcode_binaries/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -Wcrl,installnametoolpath,../../build/mac_files/xcode_binaries/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Werror -fuse-ld=lld -Wl,-fatal_warnings -Wl,--color-diagnostics -arch x86_64 -no-canonical-prefixes -Wl,-dead_strip -nostdlib++ -isysroot ../../build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk -mmacosx-version-min=10.11.0 -fprofile-instr-generate -Wl,-ObjC -rpath @executable_path/ -o "./dawn_unittests" "@./dawn_unittests.rsp" ld64.lld: error: duplicate symbol: __ZN4absl15AsciiStrToLowerEPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE >>> defined in obj/third_party/dawn/third_party/gn/abseil-cpp/strings/ascii.o >>> defined in obj/third_party/abseil-cpp/absl/strings/strings/ascii.o ld64.lld: error: duplicate symbol: __ZN4absl15AsciiStrToUpperEPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE >>> defined in obj/third_party/dawn/third_party/gn/abseil-cpp/strings/ascii.o >>> defined in obj/third_party/abseil-cpp/absl/strings/strings/ascii.o ld64.lld: error: duplicate symbol: __ZN4absl26RemoveExtraAsciiWhitespaceEPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE >>> defined in obj/third_party/dawn/third_party/gn/abseil-cpp/strings/ascii.o >>> defined in obj/third_party/abseil-cpp/absl/strings/strings/ascii.o Original change's description: > Enable gn check for all build targets. > > This CL removes the `check_targets` entry from the .gn file which > will enable checking all targets. Two of the GN targets have had > missing dependencies added. > > The `gn/abseil-cpp/BUILD.gn` was referenced against the Chromium > BUILD.gn for abseil to make sure the `public_deps` and `deps` > match in the two versions. The paths are re-written to match > the Dawn paths. > > Bug: dawn:1372 > Change-Id: I371e17ec9647e6627429be5c81eb7985da3cc5b3 > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86861 > Auto-Submit: Dan Sinclair <dsinclair@chromium.org> > Kokoro: Kokoro <noreply+kokoro@google.com> > Reviewed-by: Brandon Jones <bajones@chromium.org> > Reviewed-by: Corentin Wallez <cwallez@chromium.org> > Commit-Queue: Corentin Wallez <cwallez@chromium.org> # Not skipping CQ checks because original CL landed > 1 day ago. Bug: dawn:1372 Change-Id: I1ce6d62138cd99aa3a75c74eea0ac04ce5048b6b Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/87161 Reviewed-by: Brandon Jones <bajones@chromium.org> Auto-Submit: Brandon Jones <bajones@chromium.org> Reviewed-by: Shrek Shao <shrekshao@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Austin Eng <enga@chromium.org> Commit-Queue: Austin Eng <enga@chromium.org>
50 lines
1.7 KiB
Plaintext
50 lines
1.7 KiB
Plaintext
# Copyright 2018 The Dawn Authors
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
buildconfig = "//build/config/BUILDCONFIG.gn"
|
|
|
|
# Use Python3 to run scripts. On Windows this will use python.exe or python.bat
|
|
script_executable = "python3"
|
|
|
|
default_args = {
|
|
clang_use_chrome_plugins = false
|
|
|
|
# Override the mac version so standalone Dawn compiles with at least 10.11
|
|
# which allows us to not skip the -Wunguarded-availability warning and get
|
|
# proper warnings for use of APIs that are 10.12 and above (even if
|
|
# Chromium is still on 10.10).
|
|
mac_deployment_target = "10.11.0"
|
|
mac_min_system_version = "10.11.0"
|
|
|
|
angle_enable_abseil = false
|
|
angle_standalone = false
|
|
angle_build_all = false
|
|
angle_has_rapidjson = false
|
|
angle_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
|
|
angle_vulkan_loader_dir = "//third_party/vulkan-deps/vulkan-loader/src"
|
|
angle_vulkan_tools_dir = "//third_party/vulkan-deps/vulkan-tools/src"
|
|
angle_vulkan_validation_layers_dir =
|
|
"//third_party/vulkan-deps/vulkan-validation-layers/src"
|
|
|
|
vma_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
|
|
}
|
|
|
|
check_targets = [
|
|
# Everything in BUILD.gn
|
|
"//:*",
|
|
|
|
# Everything in third_party/BUILD.gn
|
|
"//third_party/:*",
|
|
]
|