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

Soon we'll build necessary libs into gen/sdk/toolchains/... directly, which
will obviate the need to move files around like this. This is just a stopgap to
make the tree green.

BUG=none
TBR=noelallen@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/11183010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162254 0039d316-1c4b-4281-b951-d872f2087c98

native_client_sdk/src/build_tools/build_sdk.py

@@ -407,15 +407,17 @@ def GypNinjaBuild_X86(pepperdir, platform, toolchains):
       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')