mozilla-beta: changeset 203021:130e6eec39c422ecd3cfc43058be846dac573748

author	Mike Hommey <mh+mozilla@glandium.org>
	Sun, 18 May 2014 18:34:22 +0900
changeset 203021	130e6eec39c422ecd3cfc43058be846dac573748
parent 203020	2ae2a011788b54cc32bd90a192e269c5ed63760f
child 203022	c744c837c732759285b4ac375449ce5c1aab8112
push id	3741
push user	asasaki@mozilla.com
push date	Mon, 21 Jul 2014 20:25:18 +0000
treeherder	mozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mshal
bugs	1005449
milestone	32.0a1
first release with	nightly linux32 9d8d16695f6a / 32.0a1 / 20140521030200 / files nightly linux64 9d8d16695f6a / 32.0a1 / 20140521030200 / files nightly mac 9d8d16695f6a / 32.0a1 / 20140521030200 / files nightly win32 9d8d16695f6a / 32.0a1 / 20140521030200 / files nightly win64 9d8d16695f6a / 32.0a1 / 20140521030200 / files
last release without	nightly linux32 41a54c8add09 / 32.0a1 / 20140519030202 / files nightly linux64 41a54c8add09 / 32.0a1 / 20140519030202 / files nightly mac 41a54c8add09 / 32.0a1 / 20140519030202 / files nightly win32 41a54c8add09 / 32.0a1 / 20140519030202 / files nightly win64 41a54c8add09 / 32.0a1 / 20140519030202 / files

--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -82,24 +82,20 @@ flavors = {
     'FreeBSD': 'freebsd',
     'NetBSD': 'netbsd',
     'OpenBSD': 'openbsd',
 }
 gyp_vars['OS'] = flavors[os]
 
 arches = {
     'x86_64': 'x64',
-    'arm': 'arm',
     'x86': 'ia32',
-    'ppc': 'ppc',
-    'ppc64': 'ppc',
-    'ia64': 'ia64',
 }
 
-gyp_vars['target_arch'] = arches[CONFIG['CPU_ARCH']]
+gyp_vars['target_arch'] = arches.get(CONFIG['CPU_ARCH'], CONFIG['CPU_ARCH'])
 
 if CONFIG['ARM_ARCH']:
     if int(CONFIG['ARM_ARCH']) < 7:
         gyp_vars['armv7'] = 0
         gyp_vars['arm_neon_optional'] = 0
     elif os == 'Android':
         gyp_vars['armv7'] = 1
     else: