diff --git a/SConstruct b/SConstruct
index 6836b6cf2f..228faa4d84 100644
--- a/SConstruct
+++ b/SConstruct
@@ -289,9 +289,8 @@ else:
     env['HAVE_COCOA'] = 0
    
 # handling wx flags CCFLAGS should be created before
-if sys.platform == 'darwin':
-    if env['osx'] == '64cocoa':
-        wxmods = ['adv', 'core', 'base']
+if sys.platform == 'darwin' and env['osx'] == '64cocoa':
+    wxmods = ['adv', 'core', 'base']
 else:
     wxmods = ['aui', 'adv', 'core', 'base']
 
diff --git a/SconsTests/utils.py b/SconsTests/utils.py
index 9b0ce04930..74a4037109 100644
--- a/SconsTests/utils.py
+++ b/SconsTests/utils.py
@@ -5,7 +5,8 @@ import platform
 def filterWarnings(self, flags):
     return ' '.join(
         flag
-        for flag in flags
+        # flags might contain tuples, like ('-arch','i386')
+        for flag in map(lambda x:(x,'='.join(x))[isinstance(x,tuple)],flags)
         if not flag.startswith('-W')
         )