summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2012-12-16 09:18:48 -0800
committerDan Nicholson <dbn.lists@gmail.com>2012-12-19 07:20:05 -0800
commit72e1346d044ccf72735b2c4a2e72f79fa20b236b (patch)
tree22f650c854b48800ac9a099e4bdb8acbffccf06c
parent5b463c927b6caeb332bb147572ea82b1650ceb7d (diff)
downloadpkg-config-72e1346d044ccf72735b2c4a2e72f79fa20b236b.tar.gz
Add root /lib* directories to the default -L paths
Avoids outputting -L/lib, which the linker will search in implicitly like -L/usr/lib. Freedesktop #58363 (https://bugs.freedesktop.org/show_bug.cgi?id=58363)
-rw-r--r--configure.ac4
-rw-r--r--pkg-config.12
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 7e887d4..2b79704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,10 +75,10 @@ AC_ARG_WITH([system_library_path],
[
case "$libdir" in
*lib64)
- system_library_path="/usr/lib64:/usr/lib"
+ system_library_path="/usr/lib64:/lib64:/usr/lib:/lib"
;;
*)
- system_library_path="/usr/lib"
+ system_library_path="/usr/lib:/lib"
;;
esac
])
diff --git a/pkg-config.1 b/pkg-config.1
index d76fd51..dd4a8f8 100644
--- a/pkg-config.1
+++ b/pkg-config.1
@@ -269,7 +269,7 @@ disables said behavior.
Don't strip -I/usr/include out of cflags.
.TP
.I "PKG_CONFIG_ALLOW_SYSTEM_LIBS"
-Don't strip -L/usr/lib out of libs
+Don't strip -L/usr/lib or -L/lib out of libs.
.TP
.I "PKG_CONFIG_SYSROOT_DIR"
Modify -I and -L to use the directories located in target sysroot.