Merge pull request #1360 from centricular/fix-arch-python

test cases\common\135 generated assembly: rename copy.py
8 years ago · 34cc5bcc9f
parent 97911c4384 8e585b468b
commit 34cc5bcc9f
4 changed files with 2 additions and 2 deletions
--- a/cases/common/134
+++ b/cases/common/134
--- a/cases/common/134
+++ b/cases/common/134
@ -4,7 +4,7 @@ if meson.get_compiler('c').get_id() != 'clang'
  error('MESON_SKIP_TEST: LLVM IR files can only be built with clang')
 endif
-copy = find_program('copy.py')
+copy = find_program('copyfile.py')
 copygen = generator(copy,
  arguments : ['@INPUT@', '@OUTPUT@'],
--- a/assembly/copyfile.py
+++ b/assembly/copyfile.py
--- a/assembly/meson.build
+++ b/assembly/meson.build
@ -17,7 +17,7 @@ if cc.symbols_have_underscore_prefix()
  add_project_arguments('-DMESON_TEST__UNDERSCORE_SYMBOL', language : 'c')
 endif
-copy = find_program('copy.py')
+copy = find_program('copyfile.py')
 output = 'square-@0@.S'.format(cpu)
 input = output + '.in'