diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-22 06:00:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 06:00:04 -0400 |
| commit | a48a9217e4efa2dddfd8338fad858933b3cf573b (patch) | |
| tree | 1e75eff07c1da6612a4b649627895ed8d4b908ee /mesonbuild/modules/gnome.py | |
| parent | 624709bfc10b8bbdddd70fe814b00313facdc789 (diff) | |
| parent | 70776cda98b65803eac7f847041ec3768bc37267 (diff) | |
| download | meson-a48a9217e4efa2dddfd8338fad858933b3cf573b.zip meson-a48a9217e4efa2dddfd8338fad858933b3cf573b.tar.gz meson-a48a9217e4efa2dddfd8338fad858933b3cf573b.tar.bz2 | |
Merge pull request #1966 from QuLogic/gtkdoc-libraries
Small gtkdoc improvements
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 6c22976..fe85aa0 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -294,7 +294,7 @@ class GnomeModule(ExtensionModule): else: link_command = ['-l' + lib.name] if isinstance(lib, build.SharedLibrary): - libdir = state.backend.get_target_dir(lib) + libdir = os.path.join(state.environment.get_build_dir(), state.backend.get_target_dir(lib)) link_command.append('-L' + libdir) # Needed for the following binutils bug: # https://github.com/mesonbuild/meson/issues/1911 @@ -303,6 +303,8 @@ class GnomeModule(ExtensionModule): for d in state.backend.determine_rpath_dirs(lib): d = os.path.join(state.environment.get_build_dir(), d) link_command.append('-L' + d) + if include_rpath: + link_command.append('-Wl,-rpath,' + d) if include_rpath: link_command.append('-Wl,-rpath,' + libdir) if depends: @@ -700,6 +702,8 @@ class GnomeModule(ExtensionModule): for inc_dir in src_dir.get_incdirs(): header_dirs.append(os.path.join(state.environment.get_source_dir(), src_dir.get_curdir(), inc_dir)) + header_dirs.append(os.path.join(state.environment.get_build_dir(), + src_dir.get_curdir(), inc_dir)) else: header_dirs.append(src_dir) |