From 61ff404eead8f4041f06346b39cca60a9fa76976 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Fri, 29 Mar 2013 22:24:42 +0100 Subject: node-gyp@0.9.5 --- node_modules/node-gyp/gyp/pylib/gyp/generator/make.py | 2 +- node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'node_modules/node-gyp/gyp') 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() -- cgit v1.2.3