From 265d00eff491400ae854a8b142645a464753ca88 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sat, 2 May 2020 22:43:05 +0200 Subject: [PATCH] chore: patch gn/find_msvc.py esy/gn_find_msvc.py.patch --- esy/build.sh | 1 + esy/gn_find_msvc.py.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 esy/gn_find_msvc.py.patch diff --git a/esy/build.sh b/esy/build.sh index e022e76c06fd..dd201faf3e0f 100644 --- a/esy/build.sh +++ b/esy/build.sh @@ -21,6 +21,7 @@ ln -s third_party/externals/gyp tools/gyp if [[ $OS == "windows" ]] then WINDOWS_PYTHON_PATH="$(cygpath -w $(which $PYTHON_BINARY))" + patch gn/find_msvc.py esy/gn_find_msvc.py.patch bin/gn gen $cur__target_dir/out/Shared --script-executable="$WINDOWS_PYTHON_PATH" --args='is_debug=false is_component_build=true' || exit -1 ninja.exe -C $cur__target_dir/out/Shared mv $cur__target_dir/out/Shared/libskia.dll $cur__target_dir/out/Shared/skia.dll # TODO this might not be required once we merge upstream diff --git a/esy/gn_find_msvc.py.patch b/esy/gn_find_msvc.py.patch new file mode 100644 index 000000000000..497b0504bca6 --- /dev/null +++ b/esy/gn_find_msvc.py.patch @@ -0,0 +1,11 @@ +--- gn/find_msvc.py 2020-05-02 22:36:22.327109535 +0200 ++++ gn/find_msvc.py_new 2020-05-02 22:37:19.234516915 +0200 +@@ -11,7 +11,7 @@ + C:\\Program Files (x86)\\Microsoft Visual Studio\\${RELEASE}\\${VERSION}\\VC + ''' + def find_msvc(): +- if sys.platform.startswith('win'): ++ if sys.platform.startswith('win') or "cygwin" in sys.platform: + default_dir = r'C:\Program Files (x86)\Microsoft Visual Studio' + for release in ['2019', '2017']: + for version in ['Enterprise', 'Professional', 'Community', 'BuildTools']: