| OLD | NEW |
| 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 # | 4 # |
| 5 # Environment variable NACL_ARCH should be set to one of the following | 5 # Environment variable NACL_ARCH should be set to one of the following |
| 6 # values: i686 x86_64 pnacl arm | 6 # values: i686 x86_64 pnacl arm |
| 7 | 7 |
| 8 | 8 |
| 9 # NAMING CONVENTION | 9 # NAMING CONVENTION |
| 10 # ================= | 10 # ================= |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 DESTDIR=${INSTALL_DIR} | 256 DESTDIR=${INSTALL_DIR} |
| 257 fi | 257 fi |
| 258 | 258 |
| 259 DESTDIR_LIB=${DESTDIR}/${PREFIX}/lib | 259 DESTDIR_LIB=${DESTDIR}/${PREFIX}/lib |
| 260 DESTDIR_BIN=${DESTDIR}/${PREFIX}/bin | 260 DESTDIR_BIN=${DESTDIR}/${PREFIX}/bin |
| 261 DESTDIR_INCLUDE=${DESTDIR}/${PREFIX}/include | 261 DESTDIR_INCLUDE=${DESTDIR}/${PREFIX}/include |
| 262 | 262 |
| 263 PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}/${TOOLCHAIN}" | 263 PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}/${TOOLCHAIN}" |
| 264 PUBLISH_CREATE_NMF_ARGS="-L ${DESTDIR_LIB}" | 264 PUBLISH_CREATE_NMF_ARGS="-L ${DESTDIR_LIB}" |
| 265 | 265 |
| 266 if [[ ${OS_NAME} == Linux ]]; then |
| 267 SEL_LDR_SUPPORTS_ARM=1 |
| 268 else |
| 269 SEL_LDR_SUPPORTS_ARM=0 |
| 270 fi |
| 271 |
| 266 SKIP_SEL_LDR_TESTS=0 | 272 SKIP_SEL_LDR_TESTS=0 |
| 267 | 273 |
| 268 # Skip sel_ldr tests on ARM, except on linux where we have qemu-arm available. | 274 # Skip sel_ldr tests on ARM, except on linux where we have qemu-arm available. |
| 269 if [ "${NACL_ARCH}" = "arm" -a "${OS_NAME}" != "Linux" ]; then | 275 if [[ ${NACL_ARCH} == arm && ${SEL_LDR_SUPPORTS_ARM} == 0 ]]; then |
| 270 SKIP_SEL_LDR_TESTS=1 | 276 SKIP_SEL_LDR_TESTS=1 |
| 271 fi | 277 fi |
| 272 | 278 |
| 273 # Skip sel_ldr tests when building x86_64 targets on a 32-bit host | 279 # Skip sel_ldr tests when building x86_64 targets on a 32-bit host |
| 274 if [ "${NACL_ARCH}" = "x86_64" -a "${HOST_IS_32BIT}" = "1" ]; then | 280 if [ "${NACL_ARCH}" = "x86_64" -a "${HOST_IS_32BIT}" = "1" ]; then |
| 275 echo "WARNING: Building x86_64 targets on i686 host. Cannot run tests." | 281 echo "WARNING: Building x86_64 targets on i686 host. Cannot run tests." |
| 276 SKIP_SEL_LDR_TESTS=1 | 282 SKIP_SEL_LDR_TESTS=1 |
| 277 fi | 283 fi |
| 278 | 284 |
| 279 | 285 |
| (...skipping 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1599 ###################################################################### | 1605 ###################################################################### |
| 1600 # Always run | 1606 # Always run |
| 1601 # These functions are called when this script is imported to do | 1607 # These functions are called when this script is imported to do |
| 1602 # any essential checking/setup operations. | 1608 # any essential checking/setup operations. |
| 1603 ###################################################################### | 1609 ###################################################################### |
| 1604 PatchSpecsFile | 1610 PatchSpecsFile |
| 1605 InjectSystemHeaders | 1611 InjectSystemHeaders |
| 1606 InstallConfigSite | 1612 InstallConfigSite |
| 1607 GetRevision | 1613 GetRevision |
| 1608 MakeDirs | 1614 MakeDirs |
| OLD | NEW |