diff options
| author | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-04 06:32:21 +0000 |
|---|---|---|
| committer | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-04 06:32:21 +0000 |
| commit | c5707ee6e2afe3d2c40b28b62f8d55dd7885a808 (patch) | |
| tree | d57be773d7928387863ec571012ed3d28eb0e971 /ppapi/ppapi_nacl_test_common.gypi | |
| parent | b8a46fba93af033b82bd8890ffae01ee4791b0c4 (diff) | |
| download | chromium_src-c5707ee6e2afe3d2c40b28b62f8d55dd7885a808.zip chromium_src-c5707ee6e2afe3d2c40b28b62f8d55dd7885a808.tar.gz chromium_src-c5707ee6e2afe3d2c40b28b62f8d55dd7885a808.tar.bz2 | |
Use gyp variables for NaCl untrusted build paths instead of hardcoding them.
Add the build_irt variable to targets which are part of the NaCl IRT.
The aim of this CL is to enable the IRT to use untrusted library builds
which are separate from those linked into testing nexes and the NaCl
SDK, and ultimately to allow a different compiler to be used to build them.
These libraries get an extra build_irt variable which will cause them to
be built an extra time for the IRT. This is a prerequisite for NaCl CL
https://codereview.chromium.org/21362004
to be DEPSed into Chrome, after which the build_newlib variable for most
of them can go away (most libraries only need to go into the IRT or into
the SDK/test nexes, but not both).
R=bradnelson@google.com
TBR=dmichael@chromium.org,brettw@chromium.org,piman@chromium.org,fischman@chromium.org
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3577
Review URL: https://chromiumcodereview.appspot.com/21898006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_nacl_test_common.gypi')
| -rw-r--r-- | ppapi/ppapi_nacl_test_common.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi index 2d7173d..dd1adb1 100644 --- a/ppapi/ppapi_nacl_test_common.gypi +++ b/ppapi/ppapi_nacl_test_common.gypi @@ -152,14 +152,14 @@ 'inputs': ['>(out_glibc64)'], 'action': [ '--library-path=>(libdir_glibc64)', - '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64', + '--library-path=>(tc_lib_dir_glibc64)', ], }], ['enable_x86_32==1', { 'inputs': ['>(out_glibc32)'], 'action': [ '--library-path=>(libdir_glibc32)', - '--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32', + '--library-path=>(tc_lib_dir_glibc32)', ], }], # TODO(ncbray) handle arm case. We don't have ARM glibc yet. |