diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 21:24:03 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 21:24:03 +0000 |
| commit | 511833408f73cacc044db20a5e8bb57bdc329e14 (patch) | |
| tree | 90dda1a8746b02e8b869392c8f5f124d702fbb72 /build | |
| parent | 806b5234f0d9c1d695ddcea6932607997be8c645 (diff) | |
| download | chromium_src-511833408f73cacc044db20a5e8bb57bdc329e14.zip chromium_src-511833408f73cacc044db20a5e8bb57bdc329e14.tar.gz chromium_src-511833408f73cacc044db20a5e8bb57bdc329e14.tar.bz2 | |
Revert 168603 - 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
TBR=binji@chromium.org
Review URL: https://codereview.chromium.org/11299081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/build/all.gyp b/build/all.gyp index b2bc5c7..bcbb259 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -350,21 +350,6 @@ '../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"', { |