diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2013-03-30 01:24:42 +0400 |
|---|---|---|
| committer | Nathan Zadoks <nathan@nathan7.eu> | 2013-03-30 01:24:42 +0400 |
| commit | 61ff404eead8f4041f06346b39cca60a9fa76976 (patch) | |
| tree | b1b6e8545142689976e08bd425326600cb831ff2 /node_modules/node-gyp/gyp | |
| parent | 7d0bab7741bb85cab5458a08724ddd2e0789fc8e (diff) | |
node-gyp@0.9.5
Diffstat (limited to 'node_modules/node-gyp/gyp')
| -rw-r--r-- | node_modules/node-gyp/gyp/pylib/gyp/generator/make.py | 2 | ||||
| -rw-r--r-- | node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py b/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py index 2733e82f5..133d8f8c6 100644 --- a/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py +++ b/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py @@ -351,7 +351,7 @@ cmd_touch = touch $@ quiet_cmd_copy = COPY $@ # send stderr to /dev/null to ignore messages when linking directories. -cmd_copy = ln -sf "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@") +cmd_copy = rm -rf "$@" && cp -af "$<" "$@" %(link_commands)s """ diff --git a/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py b/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py index 4d081451f..f15b473ef 100644 --- a/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py +++ b/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py @@ -1679,7 +1679,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, master_ninja.rule( 'copy', description='COPY $in $out', - command='ln -sf $in $out 2>/dev/null || (rm -rf $out && cp -af $in $out)') + command='rm -rf $out && cp -af $in $out') master_ninja.newline() all_targets = set() |