Skip to content

Commit

Permalink
chore: patch gn/find_msvc.py esy/gn_find_msvc.py.patch
Browse files Browse the repository at this point in the history
  • Loading branch information
Et7f3 committed May 2, 2020
1 parent 1e47ae1 commit 265d00e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions esy/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions esy/gn_find_msvc.py.patch
Original file line number Diff line number Diff line change
@@ -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']:

0 comments on commit 265d00e

Please sign in to comment.