Fix Android build after arch-subdir reorganisation.
authorerik.corry@gmail.com <erik.corry@gmail.com@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Fri, 24 Apr 2009 12:56:58 +0000 (12:56 +0000)
committererik.corry@gmail.com <erik.corry@gmail.com@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Fri, 24 Apr 2009 12:56:58 +0000 (12:56 +0000)
Review URL: http://codereview.chromium.org/94008

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1791 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

SConstruct

index 48665a7031e44b49f2c7359ed8a01b5e6fc2e1e9..05cb62530522cc7433dfc44c5ca72b7723a78cf8 100644 (file)
@@ -581,13 +581,13 @@ class BuildContext(object):
 
   def AddRelevantFlags(self, initial, flags):
     result = initial.copy()
-    self.AppendFlags(result, flags.get('all'))
     toolchain = self.options['toolchain']
     if toolchain in flags:
       self.AppendFlags(result, flags[toolchain].get('all'))
       for option in sorted(self.options.keys()):
         value = self.options[option]
         self.AppendFlags(result, flags[toolchain].get(option + ':' + value))
+    self.AppendFlags(result, flags.get('all'))
     return result
 
   def AddRelevantSubFlags(self, options, flags):