Description: Do not set rpath on binaries
Author: Артём Попов <artfwo@gmail.com>
Forwarded: no
Last-Update: 2011-06-11
--- a/common/SConstruct
+++ b/common/SConstruct
@@ -789,7 +789,7 @@
 elif PLATFORM == 'linux':
     serverEnv.Append(
                 CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')],
-                LINKFLAGS = ['-Wl,-rpath,' + FINAL_PREFIX + '/lib'])
+                LINKFLAGS = ['-Wl,-rpath-link,' + FINAL_PREFIX + '/lib'])
 
 elif PLATFORM == 'freebsd':
     serverEnv.Append(CPPDEFINES = [('SC_PLUGIN_LOAD_SYM', '\\"load\\"')])
@@ -1042,12 +1042,12 @@
                 CPPPATH = ['#include/icu/unicode'])
 elif PLATFORM == 'linux':
     langEnv.Append(
-        LINKFLAGS = ['-Wl,-rpath,build', '-Wl,-rpath,' + FINAL_PREFIX + '/lib'])
+        LINKFLAGS = ['-Wl,-rpath-link,build', '-Wl,-rpath-link,' + FINAL_PREFIX + '/lib'])
 
 
 elif PLATFORM == 'freebsd':
     langEnv.Append(
-    LINKFLAGS = '-Wl,-rpath,build -Wl,-rpath,' + FINAL_PREFIX + '/lib')
+    LINKFLAGS = '-Wl,-rpath-link,build -Wl,-rpath-link,' + FINAL_PREFIX + '/lib')
 
 libsclangEnv = langEnv.Clone(
     PKGCONFIG_NAME = 'libsclang',
