diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-08-08 12:32:34 -0700 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-08-08 12:32:34 -0700 |
| commit | d53fccbce577424d66cf5ac8961b26421d5d467a (patch) | |
| tree | e0085cabf23653e9495dff320fddad9f243eaeeb /tools | |
| parent | db1bf679d8047e661b31ffcbd1418da335246413 (diff) | |
| download | nodejs-d53fccbce577424d66cf5ac8961b26421d5d467a.tar.gz nodejs-d53fccbce577424d66cf5ac8961b26421d5d467a.tar.bz2 nodejs-d53fccbce577424d66cf5ac8961b26421d5d467a.zip | |
Fix MSVS build
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/gyp_node | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/gyp_node b/tools/gyp_node index 3cc65276d..f38aa7169 100755 --- a/tools/gyp_node +++ b/tools/gyp_node @@ -22,9 +22,17 @@ def run_gyp(args): if __name__ == '__main__': args = sys.argv[1:] - args.append(os.path.join(os.path.abspath(node_root), 'node.gyp')) - options_fn = os.path.abspath(os.path.join(node_root, 'options.gypi')) + # GYP bug. + # On msvs it will crash if it gets an absolute path. + # On Mac/make it will crash if it doesn't get an absolute path. + if sys.platform == 'win32': + args.append(os.path.join(node_root, 'node.gyp')) + options_fn = os.path.join(node_root, 'options.gypi') + else: + args.append(os.path.join(os.path.abspath(node_root), 'node.gyp')) + options_fn = os.path.join(os.path.abspath(node_root), 'options.gypi') + if os.path.exists(options_fn): args.extend(['-I', options_fn]) |