encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-06 22:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the correct GN variable for the Mac deployment target.

Browse Source 
The GN files were incorrectly using mac_min_system_version to refer to
the deployment target. The right variable is mac_deployment_target, and
using mac_min_system_version breaks Chrome's ability to update the
minimum system version without needing to update the deployment target.

Bug: chromium:1148931
Change-Id: I4c49bb24cb6c4293249c5cb26dd8971b863d260c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/32720
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Robert Sesek 2020-11-16 14:53:59 +00:00 committed by Commit Bot service account
parent 575729e8dd
commit dd6b36e880
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dawn_native/BUILD.gn
View File

@ -19,12 +19,12 @@ import("${dawn_root}/generator/dawn_generator.gni")
import("${dawn_root}/scripts/dawn_component.gni") import("${dawn_root}/scripts/dawn_component.gni")
import("${dawn_root}/scripts/dawn_features.gni") import("${dawn_root}/scripts/dawn_features.gni")
# Import mac_min_system_version # Import mac_deployment_target
if (is_mac) { if (is_mac) {
if (dawn_has_build) { if (dawn_has_build) {
import("//build/config/mac/mac_sdk.gni") import("//build/config/mac/mac_sdk.gni")
} else { } else {
mac_min_system_version = "10.11.0" mac_deployment_target = "10.11.0"
} }
} }
@ -63,7 +63,7 @@ config("dawn_native_internal") {
# TODO(cwallez@chromium.org): Consider using API_AVAILABLE annotations on all # TODO(cwallez@chromium.org): Consider using API_AVAILABLE annotations on all
# metal code in dawn once crbug.com/1004024 is sorted out if Chromium still # metal code in dawn once crbug.com/1004024 is sorted out if Chromium still
# supports 10.10 then. # supports 10.10 then.
if (is_mac && mac_min_system_version == "10.10.0") { if (is_mac && mac_deployment_target == "10.10.0") {
cflags_objcc = [ "-Wno-unguarded-availability" ] cflags_objcc = [ "-Wno-unguarded-availability" ]
} }
} }