| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 set -o nounset | 6 set -o nounset |
| 7 set -o errexit | 7 set -o errexit |
| 8 | 8 |
| 9 SCRIPT_DIR="$(cd $(dirname $0) && pwd)" | 9 SCRIPT_DIR="$(cd $(dirname $0) && pwd)" |
| 10 cd ${SCRIPT_DIR} | 10 cd ${SCRIPT_DIR} |
| 11 | 11 |
| 12 OUT_DIR=out | 12 OUT_DIR=out |
| 13 NACLPORTS_URL=https://chromium.googlesource.com/external/naclports.git | 13 NACLPORTS_URL=https://chromium.googlesource.com/external/naclports.git |
| 14 NACLPORTS_REV=873ca4910a5f9d4206306aacb4ed79c587c6a5f3 | 14 NACLPORTS_REV=796184d48c27d65f48638a51ae144d651cd9f90d |
| 15 NACLPORTS_DIR=${OUT_DIR}/naclports | 15 NACLPORTS_DIR=${OUT_DIR}/naclports |
| 16 | 16 |
| 17 if [ -z "${NACL_SDK_ROOT:-}" ]; then | 17 if [ -z "${NACL_SDK_ROOT:-}" ]; then |
| 18 echo "-------------------------------------------------------------------" | 18 echo "-------------------------------------------------------------------" |
| 19 echo "NACL_SDK_ROOT is unset." | 19 echo "NACL_SDK_ROOT is unset." |
| 20 echo "This environment variable needs to be pointed at some version of" | 20 echo "This environment variable needs to be pointed at some version of" |
| 21 echo "the Native Client SDK (the directory containing toolchain/)." | 21 echo "the Native Client SDK (the directory containing toolchain/)." |
| 22 echo "NOTE: set this to an absolute path." | 22 echo "NOTE: set this to an absolute path." |
| 23 echo "-------------------------------------------------------------------" | 23 echo "-------------------------------------------------------------------" |
| 24 exit -1 | 24 exit -1 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 Banner Building lua | 56 Banner Building lua |
| 57 pushd ${NACLPORTS_DIR}/src | 57 pushd ${NACLPORTS_DIR}/src |
| 58 # Do a 'clean' first, since previous lua build from the naclports bundle | 58 # Do a 'clean' first, since previous lua build from the naclports bundle |
| 59 # building might be installed in the toolchain, and that one is built | 59 # building might be installed in the toolchain, and that one is built |
| 60 # without readline support. | 60 # without readline support. |
| 61 make TOOLCHAIN=pnacl clean | 61 make TOOLCHAIN=pnacl clean |
| 62 make TOOLCHAIN=pnacl lua-ppapi | 62 make TOOLCHAIN=pnacl lua-ppapi |
| 63 popd | 63 popd |
| 64 | 64 |
| 65 Banner Done! | 65 Banner Done! |
| OLD | NEW |