[gobject-introspection] scanner: Only add rpaths for absolute directories
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] scanner: Only add rpaths for absolute directories
- Date: Fri, 4 Nov 2011 00:34:53 +0000 (UTC)
commit 72d5fe5a2794c435b750b347b7584841611f1cb7
Author: Colin Walters <walters verbum org>
Date: Thu Nov 3 20:33:53 2011 -0400
scanner: Only add rpaths for absolute directories
We shouldn't do it for module-internal paths, since it can't work
and is unnecessary even if it did.
giscanner/dumper.py | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 3645d4c..0c49022 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -277,11 +277,12 @@ class DumpCompiler(object):
for library_path in self._options.library_paths:
args.append('-L' + library_path)
- if libtool:
- args.append('-rpath')
- args.append(library_path)
- else:
- args.append('-Wl,-rpath=' + library_path)
+ if os.path.isabs(library_path):
+ if libtool:
+ args.append('-rpath')
+ args.append(library_path)
+ else:
+ args.append('-Wl,-rpath=' + library_path)
args.extend(self._run_pkgconfig('--libs'))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]