Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(955)

Unified Diff: native_client_sdk/src/build_tools/build_sdk.py

Issue 921243002: Roll NaCl toolchain change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NaCl revert and rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 17112423a9aa9f6379a077b81f36134ff8090545..d0102c7b4bee38fe0fad73b95bf952fde2c18baf 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -170,7 +170,7 @@ def BuildStepDownloadToolchains(toolchains):
if 'bionic' in toolchains:
build_platform = '%s_x86' % getos.GetPlatform()
args.extend(['--append', os.path.join(build_platform, 'nacl_arm_bionic')])
- args.append('sync')
+ args.extend(['sync', '--extract'])
buildbot_common.Run(args, cwd=NACL_DIR)
@@ -343,6 +343,8 @@ def MakeNinjaRelPath(path):
return os.path.join(os.path.relpath(OUT_DIR, SRC_DIR), path)
+# TODO(ncbray): stop building and copying libraries into the SDK that are
+# already provided by the toolchain.
TOOLCHAIN_LIBS = {
'bionic' : [
'libminidump_generator.a',
@@ -352,8 +354,6 @@ TOOLCHAIN_LIBS = {
'libppapi.a',
],
'newlib' : [
- 'crti.o',
- 'crtn.o',
'libminidump_generator.a',
'libnacl.a',
'libnacl_dyncode.a',
@@ -464,10 +464,6 @@ def GypNinjaInstall(pepperdir, toolchains):
bionic_dir = GetOutputToolchainLib(pepperdir, 'bionic', xarch)
InstallFiles(src_dir, bionic_dir, TOOLCHAIN_LIBS['bionic'])
- if tc != 'pnacl':
- src_dir = GetGypToolchainLib(tc, xarch)
- InstallFiles(src_dir, dst_dir, ['crt1.o'])
-
def GypNinjaBuild_NaCl(rel_out_dir):
# TODO(binji): gyp_nacl doesn't build properly on Windows anymore; it only
« no previous file with comments | « build/get_landmines.py ('k') | ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698