From c95658c1f125092be2ab561e8cc39eb05e80422b Mon Sep 17 00:00:00 2001
From: "binji@chromium.org"
<binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 19 Nov 2012 21:05:23 +0000
Subject: Beginnings of moving more stuff from build_sdk.py to GYP.
Adds a new target to all.gyp: chromium_builder_nacl_sdk
Adds a native_client_sdk gyp file: it depends on nacl_core_sdk from the
native_client repo, but also builds and copies ppapi libraries to the toolchain
directories.
Retry of http://codereview.chromium.org/11363045/
This originally failed here: http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/41342
With the following error:
init.c:(.text+0x3c): undefined reference to `__libc_setup_tls'
init.c:(.text+0x2e2): undefined reference to `_dl_init_static_tls'
init.c:(.text+0x2ec): undefined reference to `_dl_wait_lookup_done'
While building simple_glibc_x86_32.nexe.
My change seems to have tickled a bug in nacl_browser_test.gypi which was using
the link flag -lpthread instead of -pthread. Changing this seems to have fixed
the link failure.
BUG=none
TBR=noelallen@chromium.org
TBR=ncbray@chromium.org
Review URL: https://codereview.chromium.org/11280063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168603 0039d316-1c4b-4281-b951-d872f2087c98
---
build/all.gyp | 15 +++++++++++++++
1 file changed, 15 insertions(+)
(limited to 'build')
diff --git a/build/all.gyp b/build/all.gyp
index bcbb259..b2bc5c7 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -350,6 +350,21 @@
'../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
],
}, # target_name: chromium_builder_webrtc
+ {
+ 'target_name': 'chromium_builder_nacl_sdk',
+ 'type': 'none',
+ 'dependencies': [
+ '../chrome/chrome.gyp:chrome',
+ '../native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp:*',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:chrome_nacl_win64',
+ ],
+ }],
+ ],
+ }, # target_name: chromium_builder_nacl_sdk
], # targets
}],
['OS=="mac"', {
--
cgit v1.1