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
|
2014-08-25 11:40:23 +02:00
|
|
|
--- a/SConstruct 2014-08-23 18:41:09.000000000 +0100
|
|
|
|
+++ b/SConstruct 2014-08-25 09:46:53.754364989 +0100
|
|
|
|
@@ -300,9 +300,6 @@ if env["sysroot"]:
|
|
|
|
|
|
|
|
# Don't hack RPATH unless libdir points somewhere that is not on the
|
|
|
|
# minimum default load path.
|
2013-12-09 18:44:24 +01:00
|
|
|
-if env["shared"]:
|
2014-08-25 11:40:23 +02:00
|
|
|
- if env["libdir"] not in ["/usr/lib", "/lib"]:
|
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:
|