GN: Fix NaCl IRT build options

ppapi/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 copy("copy_test_files") {
   visibility = [ ":*" ]
   sources = [
     # Keep "test_case.html.mock-http-headers" with "test_case.html".
     "tests/ppapi_nacl_tests_newlib.nmf",
     "tests/test_case.html",
@@ skipping 246 matching lines @@
       }
     }
 
     copy("nacl_tests_copy") {
       sources = [
         "${root_out_dir}/ppapi_nacl_tests.nexe",
       ]
 
       # The CPU names used in tests/ppapi_nacl_tests_newlib.nmf
       # are the ones used in GYP (x32 for x86).
-      if (target_cpu == "x86") {
-        nmf_cpu = "x32"
-      } else if (current_cpu != "pnacl") {
-        nmf_cpu = target_cpu
-      }
-      if (is_nacl_glibc) {
-        suffix = "glibc_${nmf_cpu}"
-      } else if (current_cpu == "pnacl") {
+      if (current_cpu == "pnacl") {
         suffix = "pnacl"
       } else {
-        suffix = "newlib_${nmf_cpu}"
+        if (target_cpu == "x86") {
+          nmf_cpu = "x32"
+        } else if (current_cpu != "pnacl") {
+          nmf_cpu = target_cpu
+        }
+        if (is_nacl_glibc) {
+          suffix = "glibc_${nmf_cpu}"
+        } else {
+          suffix = "newlib_${nmf_cpu}"
+        }
       }
       outputs = [
         "${root_build_dir}/{{source_name_part}}_${suffix}.nexe",
       ]
       if (current_cpu == "pnacl") {
         deps = [
           ":translate_pexe_to_nexe",
         ]
       } else {
         deps = [
@@ skipping 63 matching lines @@
     if (target_cpu == "x86" || target_cpu == "x64") {
       data_deps += [
         ":copy_test_files",
         ":nacl_tests_copy(//build/toolchain/nacl:clang_newlib_${target_cpu})",
         ":generate_nmf(//build/toolchain/nacl:glibc_${target_cpu})",
         ":generate_nmf(//build/toolchain/nacl:newlib_pnacl)",
       ]
     }
   }
 }