From 905759a378212ec91de7593a7b47c118c9320a6e Mon Sep 17 00:00:00 2001 From: Pavel Charvat Date: Tue, 3 Jun 2014 12:55:16 +0200 Subject: [PATCH] Build: Do not split -rpath in two -Wl options. Pkg-config could incorrectly merge multiple rpaths. --- ucw/perl/UCW/Configure/C.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm index e22ac0ed..4e2b7d5e 100644 --- a/ucw/perl/UCW/Configure/C.pm +++ b/ucw/perl/UCW/Configure/C.pm @@ -119,9 +119,9 @@ Set("LIBS" => ""); # Extra flags for compiling and linking shared libraries Set("CSHARED" => '-fPIC'); -Append("LOPT" => "-Wl,--rpath-link -Wl,run/lib"); +Append("LOPT" => "-Wl,--rpath-link,run/lib"); if (!(Get("INSTALL_LIB_DIR") eq "/usr/lib")) { - Set("SO_LINK_PATH" => "-Wl,--rpath " . Get("INSTALL_LIB_DIR")); + Set("SO_LINK_PATH" => "-Wl,--rpath," . Get("INSTALL_LIB_DIR")); AtWrite { # FIXME: This is a hack. GCC would otherwise fail to link binaries. my $libdir = Get("INSTALL_LIB_DIR"); -- 2.39.2