Fix path generation so generations in subdirs work.

pull/338/head
Jussi Pakkanen 9 years ago
parent 7e1df7540d
commit 9bf641e545
  1. 2
      ninjabackend.py
  2. 8
      test cases/common/103 manygen/meson.build
  3. 0
      test cases/common/103 manygen/subdir/funcinfo.def
  4. 0
      test cases/common/103 manygen/subdir/manygen.py
  5. 7
      test cases/common/103 manygen/subdir/meson.build

@ -1696,7 +1696,7 @@ rule FORTRAN_DEP_HACK
continue
for f in t.output:
if self.environment.is_library(f):
libs.append(os.path.join(self.get_target_dir(target), f))
libs.append(os.path.join(self.get_target_dir(t), f))
return libs
def determine_rpath_dirs(self, target):

@ -1,12 +1,6 @@
project('manygen', 'c')
gen = find_program('manygen.py')
generated = custom_target('manygen',
output : ['gen_func.a', 'gen_func.c', 'gen_func.h', 'gen_func.o'],
input : ['funcinfo.def'],
command : [gen, '@INPUT@', '@OUTDIR@'],
)
subdir('subdir')
exe = executable('depuser', 'depuser.c',
generated)

@ -0,0 +1,7 @@
gen = find_program('manygen.py')
generated = custom_target('manygen',
output : ['gen_func.a', 'gen_func.c', 'gen_func.h', 'gen_func.o'],
input : ['funcinfo.def'],
command : [gen, '@INPUT@', '@OUTDIR@'],
)
Loading…
Cancel
Save