From: Pavel Charvat Date: Tue, 3 Jun 2014 11:36:56 +0000 (+0200) Subject: Build: SO_LINK_PATH must be always defined. X-Git-Tag: v6.0~15^2~2 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=c09cf4279b9aab5628af6f0d59482e2c239dcdfa;p=libucw.git Build: SO_LINK_PATH must be always defined. --- diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm index 4e2b7d5e..fffe7137 100644 --- a/ucw/perl/UCW/Configure/C.pm +++ b/ucw/perl/UCW/Configure/C.pm @@ -120,7 +120,10 @@ Set("LIBS" => ""); # Extra flags for compiling and linking shared libraries Set("CSHARED" => '-fPIC'); Append("LOPT" => "-Wl,--rpath-link,run/lib"); -if (!(Get("INSTALL_LIB_DIR") eq "/usr/lib")) { +if ((Get("INSTALL_LIB_DIR") eq "/usr/lib")) { + Set("SO_LINK_PATH" => ''); +} +else { Set("SO_LINK_PATH" => "-Wl,--rpath," . Get("INSTALL_LIB_DIR")); AtWrite { # FIXME: This is a hack. GCC would otherwise fail to link binaries.