Mercurial > gub

changeset 6192:194987553373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Nsis: add rpath to linux-x86::libstdc++; requires GNU/Linux build host. Fixes /usr/lib/libstdc++ dependency.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sun, 26 Aug 2012 10:59:17 +0200
parents 6d3dc146d17e
children dcf6c618308d
files gub/specs/nsis.py
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/nsis.py	Sun Aug 26 01:37:04 2012 +0200
+++ b/gub/specs/nsis.py	Sun Aug 26 10:59:17 2012 +0200
@@ -47,6 +47,12 @@
 defenv['C_INCLUDE_PATH'] = ''
 defenv['CPLUS_INCLUDE_PATH'] = ''
 defenv['CFLAGS'] = ''
+# SCons will add double quotes when LINKFLAGS contains whitespace,
+# so start and end with double quotes as so to disarm them
+#defenv['LINKFLAGS'] = '"%(rpath)s -Wl,-rpath -Wl,%(alltargetdir)s/%(build_platform)s%(root_dir)s%(prefix_dir)s/lib"'
+# Nsis is built 32 bit -- this won't work for non-GNU/Linux build hosts
+defenv['LINKFLAGS'] = '"%(rpath)s -Wl,-rpath -Wl,%(alltargetdir)s/linux-x86%(root_dir)s%(prefix_dir)s/lib"'
+
 Export('defenv')
 ''')],
                        '%(srcdir)s/SConstruct')