Chromium Code Reviews| Index: pylib/gyp/generator/make.py |
| diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py |
| index 28b856d2b37deb331ffd991b55c3a860904b8d93..85ea7e99f7dcc0926b60b01a7bb8ee5191c2787c 100644 |
| --- a/pylib/gyp/generator/make.py |
| +++ b/pylib/gyp/generator/make.py |
| @@ -365,7 +365,7 @@ cmd_touch = touch $@ |
| quiet_cmd_copy = COPY $@ |
| # send stderr to /dev/null to ignore messages when linking directories. |
| -cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp -af "$<" "$@") |
| +cmd_copy = ln -f "$<" "$@" 2>/dev/null || (rm -rf "$@" && cp %(copy_archive_args)s "$<" "$@") |
| %(link_commands)s |
| """ |
| @@ -2010,6 +2010,7 @@ def GenerateOutput(target_list, target_dicts, data, params): |
| srcdir_prefix = '$(srcdir)/' |
| flock_command= 'flock' |
| + copy_archive_arguments = '-af' |
|
Nico
2015/10/08 02:30:14
don't use a variable for this, it's never really r
|
| header_params = { |
| 'default_target': default_target, |
| 'builddir': builddir_name, |
| @@ -2019,6 +2020,7 @@ def GenerateOutput(target_list, target_dicts, data, params): |
| 'link_commands': LINK_COMMANDS_LINUX, |
| 'extra_commands': '', |
| 'srcdir': srcdir, |
| + 'copy_archive_args': copy_archive_arguments, |
| } |
| if flavor == 'mac': |
| flock_command = './gyp-mac-tool flock' |
| @@ -2043,7 +2045,9 @@ def GenerateOutput(target_list, target_dicts, data, params): |
| 'flock': 'lockf', |
| }) |
| elif flavor == 'aix': |
| + copy_archive_arguments = '-R -P -f' |
|
Nico
2015/10/08 02:30:14
do you want -p too? or does aix not have that eith
|
| header_params.update({ |
| + 'copy_archive_args': copy_archive_arguments, |
| 'link_commands': LINK_COMMANDS_AIX, |
| 'flock': './gyp-flock-tool flock', |
| 'flock_index': 2, |