From 8666849f94955f94c596a0359e102b3b5c57239b Mon Sep 17 00:00:00 2001
From: pabs3 <pabs3@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 3 Mar 2008 16:33:56 +0000
Subject: [PATCH] Fix FTBFS on Debian GNU/Linux amd64 due to not enough use of
 -m32

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5565 212acab6-be3b-0410-9dea-997c60f758d6
---
 SCons/Config/gnu | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/SCons/Config/gnu b/SCons/Config/gnu
index 26a1bb25..09ee6f79 100644
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -134,9 +134,11 @@ if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_W32']:
 	util_env.Append(LINKFLAGS = '-s')                   # strip
 conf.Finish()
 
-### cross-platform util environment stripping
+### cross-platform util environment adjustments
 
 conf = FlagsConfigure(cp_util_env)
+conf.CheckCompileFlag('-m32')
+conf.CheckLinkFlag('-m32')
 if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
 	TestStrip(conf)                                 # strip
 conf.Finish()
@@ -144,6 +146,10 @@ conf.Finish()
 ### test environment
 
 test_env = defenv.Clone()
+conf = FlagsConfigure(test_env)
+conf.CheckCompileFlag('-m32')
+conf.CheckLinkFlag('-m32')
+conf.Finish()
 
 ### weird GCC requirements