src/untrusted/pthread/nacl.scons - Issue 7265001: Build and use libraries locally in the nacl build, not requiring "partial SDK"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/untrusted/pthread/nacl.scons

Issue 7265001: Build and use libraries locally in the nacl build, not requiring "partial SDK" (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: final fix for pnacl Created 9 years, 6 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: src/untrusted/pthread/nacl.scons

diff --git a/src/untrusted/pthread/nacl.scons b/src/untrusted/pthread/nacl.scons

index 53970afffe014bde82a6cace48af4f069359b932..cf420eddbdf5068aaaa7c9e7fe5c5a46a9b89dbe 100644

--- a/src/untrusted/pthread/nacl.scons

+++ b/src/untrusted/pthread/nacl.scons

@@ -23,8 +23,10 @@ env.ComponentLibrary('libpthread', ['nc_thread.c',

env.AddLibraryToSdk(['libpthread'])

-dest_dir = ARGUMENTS.get('extra_sdk_include_destination',

- '${NACL_SDK_INCLUDE}')

-Alias('install_libpthread',

- # Copy the header file to the include directory.

- [env.Replicate(dest_dir, ['pthread.h', 'semaphore.h' ])])

+# install_libpthread is a no-op under --nacl_glibc, but without it

+# installs the header files from this directory into the toolchain.

+if not env.Bit('nacl_glibc'):

+ n = env.AddHeaderToSdk(['pthread.h', 'semaphore.h'], None)

+else:

+ n = []

+env.Alias('install_libpthread', n)

« no previous file with comments | « src/untrusted/irt_stub/nacl.scons ('k') | tests/ppapi_example_audio/audio.cc » ('j') | no next file with comments »