Merge branch 'master' into windows

1 files changed, 2 insertions, 0 deletions

diff --git a/wscript b/wscript
index 559f99d9e3..82a5ac8b77 100644
--- a/wscript
+++ b/wscript
@@ -148,6 +148,8 @@ def set_compiler_flags (conf,opt):
                 conf.env['build_target'] = 'i386'
             elif re.search("powerpc", cpu) != None:
                 conf.env['build_target'] = 'powerpc'
+            elif re.search("arm", cpu) != None:
+                conf.env['build_target'] = 'arm'
             else:
                 conf.env['build_target'] = 'i686'
     else: