diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-12-27 19:27:05 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-12-28 18:35:41 +0200 |
| commit | 9bf641e545f163cd5e9e7e3b5e9aa1f9e002e5d9 (patch) | |
| tree | 78456bd9e43ea0bdbfa2edc9b367ffa6410a15ed | |
| parent | 7e1df7540d519f63b4309b380e69b10ca5bff103 (diff) | |
| download | meson-9bf641e545f163cd5e9e7e3b5e9aa1f9e002e5d9.zip meson-9bf641e545f163cd5e9e7e3b5e9aa1f9e002e5d9.tar.gz meson-9bf641e545f163cd5e9e7e3b5e9aa1f9e002e5d9.tar.bz2 | |
Fix path generation so generations in subdirs work.
| -rw-r--r-- | ninjabackend.py | 2 | ||||
| -rw-r--r-- | test cases/common/103 manygen/meson.build | 8 | ||||
| -rw-r--r-- | test cases/common/103 manygen/subdir/funcinfo.def (renamed from test cases/common/103 manygen/funcinfo.def) | 0 | ||||
| -rwxr-xr-x | test cases/common/103 manygen/subdir/manygen.py (renamed from test cases/common/103 manygen/manygen.py) | 0 | ||||
| -rw-r--r-- | test cases/common/103 manygen/subdir/meson.build | 7 |
5 files changed, 9 insertions, 8 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 5b75bce..8fc1772 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -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): diff --git a/test cases/common/103 manygen/meson.build b/test cases/common/103 manygen/meson.build index 6079bc4..5079d1b 100644 --- a/test cases/common/103 manygen/meson.build +++ b/test cases/common/103 manygen/meson.build @@ -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) diff --git a/test cases/common/103 manygen/funcinfo.def b/test cases/common/103 manygen/subdir/funcinfo.def index b074186..b074186 100644 --- a/test cases/common/103 manygen/funcinfo.def +++ b/test cases/common/103 manygen/subdir/funcinfo.def diff --git a/test cases/common/103 manygen/manygen.py b/test cases/common/103 manygen/subdir/manygen.py index fbf2eae..fbf2eae 100755 --- a/test cases/common/103 manygen/manygen.py +++ b/test cases/common/103 manygen/subdir/manygen.py diff --git a/test cases/common/103 manygen/subdir/meson.build b/test cases/common/103 manygen/subdir/meson.build new file mode 100644 index 0000000..4470d1a --- /dev/null +++ b/test cases/common/103 manygen/subdir/meson.build @@ -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@'], +) |