Put GN object files in subdir based on the label.

build/toolchain/mac/BUILD.gn

 # Copyright (c) 2013 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.
 
 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires
 # some enhancements since the commands on Mac are slightly different than on
 # Linux.
 
 import("../goma.gni")
 import("//build/config/ios/ios_sdk.gni")
@@ skipping 34 matching lines @@
     cxx = invoker.cxx
     ld = invoker.ld
 
     # Make these apply to all tools below.
     lib_switch = "-l"
     lib_dir_switch = "-L"
 
     # Object files go in this directory. Use label_name instead of
     # target_output_name since labels will generally have no spaces and will be
     # unique in the directory.
-    # TODO(brettw) enable the label_name variant when binary support is rolled in to GN.
-    #object_subdir = "{{target_out_dir}}/{{label_name}}"
-    object_subdir = "{{target_out_dir}}/{{target_output_name}}"
+    object_subdir = "{{target_out_dir}}/{{label_name}}"
 
     tool("cc") {
       depfile = "{{output}}.d"
       precompiled_header_type = "gcc"
       command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}"
       depsformat = "gcc"
       description = "CC {{output}}"
       outputs = [
         "$object_subdir/{{source_name_part}}.o",
       ]
@@ skipping 228 matching lines @@
 }
 
 mac_toolchain("x64") {
   toolchain_cpu = "x64"
   toolchain_os = "mac"
   cc = "${goma_prefix}/gcc"
   cxx = "${goma_prefix}/g++"
   ld = cxx
   is_clang = false
 }