Chromium Code Reviews Chromium Code Reviews
Issue 10854174:
Fixing nacl-mounts breakages. (Closed)
Base URL: http://naclports.googlecode.com/svn/trunk/src/| OLD | NEW |
|---|---|
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client 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 # | 6 # |
| 7 # nacl-mounts.sh | 7 # nacl-mounts.sh |
| 8 # | 8 # |
| 9 # usage: ./nacl-mounts.sh | 9 # usage: ./nacl-mounts.sh |
| 10 # | 10 # |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 39 export CC=${NACLCC} | 39 export CC=${NACLCC} |
| 40 export CXX=${NACLCXX} | 40 export CXX=${NACLCXX} |
| 41 export CFLAGS=-I${NACL_SDK_USR_INCLUDE} | 41 export CFLAGS=-I${NACL_SDK_USR_INCLUDE} |
| 42 | 42 |
| 43 LDFLAGS=-L${NACL_SDK_USR_LIB} | 43 LDFLAGS=-L${NACL_SDK_USR_LIB} |
| 44 if [ $NACL_GLIBC != "1" ] ; then | 44 if [ $NACL_GLIBC != "1" ] ; then |
| 45 LDFLAGS="${LDFLAGS}" | 45 LDFLAGS="${LDFLAGS}" |
| 46 fi | 46 fi |
| 47 export LDFLAGS | 47 export LDFLAGS |
| 48 | 48 |
| 49 MakeDir ${PACKAGE_DIR}/test.nacl | 49 # Net tests don't work for newlib. |
| 50 ChangeDir ${PACKAGE_DIR}/test.nacl | 50 if [ $NACL_GLIBC == "1" ] ; then |
|
jvoung - send to chromium...
2012/08/21 17:40:23
Actually, this might be fixed by: https://chromium
| |
| 51 make -f ${START_DIR}/test.nacl/Makefile | 51 MakeDir ${PACKAGE_DIR}/test.nacl |
| 52 ChangeDir ${PACKAGE_DIR}/test.nacl | |
| 53 make -f ${START_DIR}/test.nacl/Makefile | |
| 52 | 54 |
| 53 RunSelLdrCommand ${PACKAGE_DIR}/test.nacl/nacl_mounts_sel_ldr_tests | 55 RunSelLdrCommand ${PACKAGE_DIR}/test.nacl/nacl_mounts_sel_ldr_tests |
| 56 fi | |
| 54 } | 57 } |
| 55 | 58 |
| 56 CustomBuildStep() { | 59 CustomBuildStep() { |
| 57 Banner "Building ${PACKAGE_NAME}" | 60 Banner "Building ${PACKAGE_NAME}" |
| 58 export PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" | 61 export PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" |
| 59 MakeDir ${PACKAGE_DIR} | 62 MakeDir ${PACKAGE_DIR} |
| 60 ChangeDir ${PACKAGE_DIR} | 63 ChangeDir ${PACKAGE_DIR} |
| 61 set -x | 64 set -x |
| 62 export CXXCMD="${NACLCC} -I${START_DIR}/../ -I${START_DIR}" | 65 export CXXCMD="${NACLCC} -I${START_DIR}/../ -I${START_DIR}" |
| 63 ${CXXCMD} -c ${START_DIR}/net/TcpSocket.cc | 66 ${CXXCMD} -c ${START_DIR}/net/TcpSocket.cc |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 161 DefaultPreInstallStep | 164 DefaultPreInstallStep |
| 162 CustomBuildStep | 165 CustomBuildStep |
| 163 CustomInstallStep | 166 CustomInstallStep |
| 164 DefaultCleanUpStep | 167 DefaultCleanUpStep |
| 165 DefaultTouchStep | 168 DefaultTouchStep |
| 166 RunSelLdrTests | 169 RunSelLdrTests |
| 167 } | 170 } |
| 168 | 171 |
| 169 CustomPackageInstall | 172 CustomPackageInstall |
| 170 exit 0 | 173 exit 0 |
| OLD | NEW |
