From 5c548924123227f1a3d1c03a2ff936161a06d631 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Mon, 11 Dec 2017 14:59:03 -0500 Subject: Filter Windows SDK and Compiler directories This avoids bugs when other directories (like the Driver SDK) show up in those folders. Bug: skia:7395 Change-Id: Iee316a7daf8d71223b999de736d63e1dc7fa31f7 Reviewed-on: https://skia-review.googlesource.com/83542 Commit-Queue: Brian Osman Reviewed-by: Mike Klein --- gn/BUILDCONFIG.gn | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gn/BUILDCONFIG.gn') diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 80cc0986cc..0e93f0a6b6 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -164,12 +164,18 @@ if (target_os == "win") { if (target_os == "win") { if (msvc == 2017 && win_toolchain_version == "") { win_toolchain_version = exec_script("//gn/highest_version_dir.py", - [ "$win_vc/Tools/MSVC" ], + [ + "$win_vc/Tools/MSVC", + "[0-9]{2}\.[0-9]{2}\.[0-9]{5}", + ], "trim string") } if (win_sdk_version == "") { win_sdk_version = exec_script("//gn/highest_version_dir.py", - [ "$win_sdk/Include" ], + [ + "$win_sdk/Include", + "[0-9]{2}\.[0-9]\.[0-9]{5}\.[0-9]", + ], "trim string") } } -- cgit v1.2.3