| OLD | NEW |
| 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2014 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 NACLPORTS_CPPFLAGS+=" -I${START_DIR}" | 5 NACLPORTS_CPPFLAGS+=" -I${START_DIR}" |
| 6 | 6 |
| 7 if [[ ${TOOLCHAIN} != emscripten ]]; then | 7 if [[ ${TOOLCHAIN} != emscripten ]]; then |
| 8 EXECUTABLES="test/unittests" | 8 EXECUTABLES="test/unittests" |
| 9 fi | 9 fi |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 cp -rf ${START_DIR}/* ${BUILD_DIR} | 33 cp -rf ${START_DIR}/* ${BUILD_DIR} |
| 34 } | 34 } |
| 35 | 35 |
| 36 BuildStep() { | 36 BuildStep() { |
| 37 if [[ ${TOOLCHAIN} == emscripten ]]; then | 37 if [[ ${TOOLCHAIN} == emscripten ]]; then |
| 38 return | 38 return |
| 39 fi | 39 fi |
| 40 SetupCrossEnvironment | 40 SetupCrossEnvironment |
| 41 export TOOLCHAIN | 41 export TOOLCHAIN |
| 42 export NACL_SHARED | 42 export NACL_SHARED |
| 43 export GTEST_DIR=${NACL_PREFIX}/src/gtest |
| 43 DefaultBuildStep | 44 DefaultBuildStep |
| 44 } | 45 } |
| 45 | 46 |
| 46 TestStep() { | 47 TestStep() { |
| 47 if [[ ${TOOLCHAIN} == emscripten ]]; then | 48 if [[ ${TOOLCHAIN} == emscripten ]]; then |
| 48 return | 49 return |
| 49 fi | 50 fi |
| 50 if [[ ${NACL_LIBC} == glibc ]]; then | 51 if [[ ${NACL_LIBC} == glibc ]]; then |
| 51 SetupCrossEnvironment | 52 SetupCrossEnvironment |
| 52 export TOOLCHAIN | 53 export TOOLCHAIN |
| (...skipping 14 matching lines...) Expand all Loading... |
| 67 MakeDir ${DESTDIR_LIB} | 68 MakeDir ${DESTDIR_LIB} |
| 68 LogExecute cp libnacl_spawn.a ${DESTDIR_LIB} | 69 LogExecute cp libnacl_spawn.a ${DESTDIR_LIB} |
| 69 if [[ ${NACL_SHARED} == 1 ]]; then | 70 if [[ ${NACL_SHARED} == 1 ]]; then |
| 70 LogExecute cp libnacl_spawn.so ${DESTDIR_LIB} | 71 LogExecute cp libnacl_spawn.so ${DESTDIR_LIB} |
| 71 fi | 72 fi |
| 72 LogExecute cp libcli_main.a ${DESTDIR_LIB} | 73 LogExecute cp libcli_main.a ${DESTDIR_LIB} |
| 73 MakeDir ${DESTDIR_INCLUDE} | 74 MakeDir ${DESTDIR_INCLUDE} |
| 74 LogExecute cp -f ${START_DIR}/include/spawn.h ${DESTDIR_INCLUDE}/ | 75 LogExecute cp -f ${START_DIR}/include/spawn.h ${DESTDIR_INCLUDE}/ |
| 75 LogExecute cp -f ${START_DIR}/include/nacl_main.h ${DESTDIR_INCLUDE}/ | 76 LogExecute cp -f ${START_DIR}/include/nacl_main.h ${DESTDIR_INCLUDE}/ |
| 76 } | 77 } |
| OLD | NEW |