2012-07-25 00:04:21 +02:00
|
|
|
Disable addition of RPATH to the generated libraries
|
|
|
|
|
|
2013-12-09 18:44:24 +01:00
|
|
|
Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
2012-07-25 00:04:21 +02:00
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
|
|
|
|
2013-11-23 12:35:25 +01:00
|
|
|
diff -Nurp a/SConstruct b/SConstruct
|
|
|
|
|
--- a/SConstruct 2013-11-22 13:10:01.000000000 +0000
|
|
|
|
|
+++ b/SConstruct 2013-11-23 11:26:57.698486777 +0000
|
2013-12-09 18:44:24 +01:00
|
|
|
@@ -299,11 +299,6 @@ if env["sysroot"]:
|
|
|
|
|
# system default load path. /lib and /usr/lib should always be on
|
|
|
|
|
# this; listing them explicitly is a fail-safe against this ldconfig
|
|
|
|
|
# invocation not doing what we expect.
|
|
|
|
|
-if env["shared"]:
|
|
|
|
|
- sysrpath = Split(_getoutput("ldconfig -v -N -X 2>/dev/null | sed -n -e '/^\//s/://p'"))
|
|
|
|
|
- if env["libdir"] not in ["/usr/lib", "/lib"] + sysrpath:
|
2014-01-04 12:08:36 +01:00
|
|
|
- announce("Prepending %s to RPATH." % installdir('libdir', False))
|
2013-12-09 18:44:24 +01:00
|
|
|
- env.Prepend(RPATH=[installdir('libdir')])
|
2012-07-25 00:04:21 +02:00
|
|
|
|
|
|
|
|
# Give deheader a way to set compiler flags
|
|
|
|
|
if 'MORECFLAGS' in os.environ:
|
