[NaCl SDK] Fix SDK tree: copy crt1.o from gen/sdk/toolchain/....

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Entry point for both build and try bots
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 389 matching lines @@
       lib_dir = 'lib' + bits
       src_dir = os.path.join(ninja_out_dir, 'gen', tc_dir, lib_dir)
       tcpath = os.path.join(pepperdir, 'toolchain',
                             '%s_x86_%s' % (platform, tc))
       dst_dir = GetToolchainNaClLib(tc, tcpath, 'x86', bits)
 
       buildbot_common.MakeDir(dst_dir)
       buildbot_common.CopyDir(os.path.join(src_dir, '*.a'), dst_dir)
       if tc == 'newlib':
         buildbot_common.CopyDir(os.path.join(src_dir, '*.o'), dst_dir)
-        # TODO(binji) crt1.o for newlib/32 is installed to a subdirectory for
-        # some reason. Can this be fixed in the gyp script?
-        if bits == '32':
-          buildbot_common.CopyFile(os.path.join(src_dir, '32', 'crt1.o'),
-                                   dst_dir)
 
       if tc == 'glibc':
         buildbot_common.CopyDir(os.path.join(src_dir, '*.so'), dst_dir)
 
+      # TODO(binji): temporary hack; copy crt1.o from sdk toolchain directory.
+      lib_dir = os.path.join(ninja_out_dir, 'gen', 'sdk', 'toolchain',
+                             '%s_x86_%s' % (platform, tc), 'x86_64-nacl', 'lib')
+      if bits == '32':
+        lib_dir += '32'
+      buildbot_common.CopyFile(os.path.join(lib_dir, 'crt1.o'), dst_dir)
+
 
 def GypNinjaBuild_X86_Nacl(platform, rel_out_dir):
   gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
   nacl_core_sdk_gyp = os.path.join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
   all_gyp = os.path.join(NACL_DIR, 'build', 'all.gyp')
 
   out_dir = MakeNinjaRelPath(rel_out_dir)
   GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir)
   GypNinjaBuild('ia32', gyp_py, all_gyp, 'ncval_x86_32', out_dir)
 
@@ skipping 576 matching lines @@
       # Archive on non-trybots.
       if options.archive or buildbot_common.IsSDKBuilder():
         BuildStepArchiveBundle(pepper_ver, clnumber, tarfile)
         BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))