diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 20:06:08 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 20:06:08 +0000 |
| commit | a962a9c04cfcec1806a2b4dbcd3d44b83d7366d0 (patch) | |
| tree | 413f46ef98e3ebd64dde1d59f6122b5562dc1e55 /native_client_sdk/src/scons | |
| parent | 7e2514c563fb4bec5e991567a816ba9e41c6c917 (diff) | |
| download | chromium_src-a962a9c04cfcec1806a2b4dbcd3d44b83d7366d0.zip chromium_src-a962a9c04cfcec1806a2b4dbcd3d44b83d7366d0.tar.gz chromium_src-a962a9c04cfcec1806a2b4dbcd3d44b83d7366d0.tar.bz2 | |
Restructuring SDK so that it builds inside a normal chrome checkout.
Adding the glibc toolchain to chromebots.
BUG=None
TEST=None
R=noelallen@google.com
Review URL: http://codereview.chromium.org/8676030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/scons')
| -rwxr-xr-x | native_client_sdk/src/scons | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/native_client_sdk/src/scons b/native_client_sdk/src/scons index c14f666..ff5918d 100755 --- a/native_client_sdk/src/scons +++ b/native_client_sdk/src/scons @@ -7,6 +7,7 @@ readonly SCRIPT_DIR="$(dirname "$0")" readonly SCRIPT_DIR_ABS="$(cd "${SCRIPT_DIR}" ; pwd -P)" +readonly SRC_DIR="$(dirname $(dirname ${SCRIPT_DIR_ABS}))" # Use the batch file as an entry point if on cygwin. if [ "x${OSTYPE}" = "xcygwin" ]; then @@ -23,15 +24,15 @@ if [ "x${OSTYPE}" = "xcygwin" ]; then exit fi -readonly BASE_SCRIPT="${SCRIPT_DIR_ABS}/third_party/scons-2.0.1/script/scons" +readonly BASE_SCRIPT="${SRC_DIR}/third_party/scons-2.0.1/script/scons" -export NACL_SDK_ROOT="${SCRIPT_DIR_ABS}" +export NACL_SDK_ROOT="${SCRIPT_DIR_ABS}/../../native_client" -export SCONS_LIB_DIR="${NACL_SDK_ROOT}/third_party/scons-2.0.1/engine" -export PYTHONPATH="${SCRIPT_DIR_ABS}/third_party/scons-2.0.1/engine:${SCRIPT_DIR_ABS}/third_party/native_client/native_client/build" +export SCONS_LIB_DIR="${SRC_DIR}/third_party/scons-2.0.1/engine" +export PYTHONPATH="${SCONS_LIB_DIR}:${SRC_DIR}/native_client/build:${SCRIPT_DIR_ABS}" # We have to do this because scons overrides PYTHONPATH and does not preserve # what is provided by the OS. The custom variable name won't be overwritten. -export PYMOX="${NACL_SDK_ROOT}/third_party/pymox" +export PYMOX="${SRC_DIR}/third_party/pymox/src" "${BASE_SCRIPT}" --file=main.scons $* |