diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-07 00:01:11 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-07 00:01:11 +0200 |
| commit | 6a627c6176f6b2157390b8a26984cc24ab7b614d (patch) | |
| tree | 9e7212263a634a3bc3b303c1bb35fef23b40379c /generators.py | |
| parent | 8d1641d6a42e0a5f6db03bc38d252d3712195929 (diff) | |
| download | meson-6a627c6176f6b2157390b8a26984cc24ab7b614d.zip meson-6a627c6176f6b2157390b8a26984cc24ab7b614d.tar.gz meson-6a627c6176f6b2157390b8a26984cc24ab7b614d.tar.bz2 | |
More dynamic library path wanking.
Diffstat (limited to 'generators.py')
| -rwxr-xr-x | generators.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/generators.py b/generators.py index 643e4f5..b25cf22 100755 --- a/generators.py +++ b/generators.py @@ -130,8 +130,7 @@ class Generator(): not isinstance(d, interpreter.SharedLibrary): raise RuntimeError('Tried to link with a non-library target "%s".' % d.get_basename()) fname = self.get_target_filename(d) - if '/' not in fname: - fname = './' + fname # Hack to make ldd find the library. + fname = './' + fname # Hack to make ldd find the library. args.append(fname) return args @@ -413,7 +412,7 @@ echo Run compile.sh before this or bad things will happen. return depfixer = self.environment.get_depfixer() fname = os.path.join(outdir, target.get_filename()) - cmds = [depfixer, fname, self.environment.get_build_dir()] + cmds = [depfixer, fname, './'] outfile.write(' '.join(shell_quote(cmds)) + ' || exit\n') def generate_tests(self, outfile): |