diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-12-04 13:29:51 -0500 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-12-07 15:48:34 -0800 |
| commit | d467ae6e7867044b8d7b466776fb37089292c52b (patch) | |
| tree | 730ee0656e6bf9f0dff33346f07acd800e83ab25 /deps/gyp/gyp_main.py | |
| parent | 59ef8da69549cf6308078c6f656affba96e9439e (diff) | |
| download | qtlocation-mapboxgl-d467ae6e7867044b8d7b466776fb37089292c52b.tar.gz | |
[core] upgrade gyp to git commit 6fb8bd8
https://chromium.googlesource.com/external/gyp/+/6fb8bd829f0ca8fd432fd85ede788b6881c4f09f
Diffstat (limited to 'deps/gyp/gyp_main.py')
| -rwxr-xr-x | deps/gyp/gyp_main.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/deps/gyp/gyp_main.py b/deps/gyp/gyp_main.py index 4ec872f0f9..25a6eba94a 100755 --- a/deps/gyp/gyp_main.py +++ b/deps/gyp/gyp_main.py @@ -4,15 +4,13 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import os import sys -# TODO(mark): sys.path manipulation is some temporary testing stuff. -try: - import gyp -except ImportError, e: - import os.path - sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), 'pylib')) - import gyp +# Make sure we're using the version of pylib in this repo, not one installed +# elsewhere on the system. +sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), 'pylib')) +import gyp if __name__ == '__main__': sys.exit(gyp.script_main()) |