GN: Build NaCl tests for x64 too on x86 Windows

build/config/nacl/rules.gni

 # Copyright 2015 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/nacl/config.gni")
 
 # Generate a nmf file
 #
 # Native Client Manifest (nmf) is a JSON file that tells the browser where to
@@ skipping 53 matching lines @@
                       rebase_path(stage_dependencies, root_build_dir) ]
         lib_path = stage_dependencies
       } else {
         lib_path = root_build_dir
       }
       if (defined(lib_prefix)) {
         nmfflags += [ "--lib-prefix=" + lib_prefix ]
         lib_path += "/${lib_prefix}"
       }
 
-      # NOTE: There is no explicit dependency for the lib32
-      # and lib64 directories created in the product directory.
+      # NOTE: There is no explicit dependency for the lib directory
+      # (lib32 and lib64 for x86/x64) created in the product directory.
       # They are created as a side-effect of nmf creation.
-      nmfflags += [ "--library-path=" + rebase_path(root_out_dir) ]
-      if (current_cpu == "x86") {
-        nmfflags += [ "--library-path=" +
-                      rebase_path("${nacl_toolchain_tooldir}/lib32") ]
+      if (current_cpu == "x86" || current_cpu == "x64") {
+        # For x86, include both x86-32 and x86-64 library directories
+        # so that a single generate_nmf invocation with both x86-32
+        # and x86-64 nexes listed in executables works to generate one
+        # nmf covering both architectures.
+        glibc_tc = "//build/toolchain/nacl:glibc"
+        assert(current_toolchain == "${glibc_tc}_${current_cpu}")
+        x86_out_dir =
+            get_label_info(":${target_name}(${glibc_tc}_x86)", "root_out_dir")
+        x64_out_dir =
+            get_label_info(":${target_name}(${glibc_tc}_x64)", "root_out_dir")
+        nmfflags += [
+          "--library-path=" + rebase_path(x86_out_dir),
+          "--library-path=" + rebase_path(x64_out_dir),
+          "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib32"),
+          "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib"),
+        ]
         data = [
           "${lib_path}/lib32/",
-        ]
-      } else if (current_cpu == "x64") {
-        nmfflags +=
-            [ "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib") ]
-        data = [
           "${lib_path}/lib64/",
         ]
       } else {
-        nmfflags +=
-            [ "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib") ]
+        nmfflags += [
+          "--library-path=" + rebase_path(root_out_dir),

[Petr Hosek, 2016/05/12 22:08:26]

Was this a bug?

[Roland McGrath, 2016/05/12 22:29:59]

Previously this was done above, before this 'if' block.
I made the x86/x64 case always do both unconditionally since that seemed
clearest, so the one before the 'if' would have become redundant.  Hence I moved
it into the 'else' clause where it's still needed, and rolled it into the
existing += statement.

+          "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib"),
+        ]
         data = [
           "${lib_path}/lib/",
         ]
       }
     }
     args = [
              "--no-default-libpath",
              "--objdump=" + objdump,
              "--output=" + rebase_path(nmf, root_build_dir),
            ] + nmfflags + rebase_path(sources, root_build_dir)
@@ skipping 49 matching lines @@
     args = [
       "--program=" + rebase_path(executable, root_build_dir),
       "--arch=${arch}",
       "--output=" + rebase_path(nmf, root_build_dir),
     ]
     if (defined(invoker.nmfflags)) {
       args += invoker.nmfflags
     }
   }
 }