| 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 EXECUTABLES="ninja" | 5 EXECUTABLES="ninja" |
| 6 | 6 |
| 7 LIBS+="${NACL_CLI_MAIN_LIB} -lnacl_spawn -lppapi_simple -lnacl_io \ | 7 LIBS+="${NACL_CLI_MAIN_LIB} -lppapi_simple -lnacl_io \ |
| 8 -lppapi -lppapi_cpp" | 8 -lppapi -lppapi_cpp" |
| 9 | 9 |
| 10 if [ "${NACL_LIBC}" = "newlib" ]; then | 10 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 11 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" | 11 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" |
| 12 LIBS+=" -lglibc-compat" | 12 LIBS+=" -lglibc-compat" |
| 13 fi | 13 fi |
| 14 | 14 |
| 15 BuildHostNinja() { | 15 BuildHostNinja() { |
| 16 # Build a host version ninja in $SRC_DIR | 16 # Build a host version ninja in $SRC_DIR |
| 17 if [ -f "${SRC_DIR}/ninja" ];then | 17 if [ -f "${SRC_DIR}/ninja" ];then |
| (...skipping 21 matching lines...) Expand all Loading... |
| 39 LogExecute ${SRC_DIR}/ninja ninja_test | 39 LogExecute ${SRC_DIR}/ninja ninja_test |
| 40 RunSelLdrCommand ninja_test --gtest_filter=-SubprocessTest.* | 40 RunSelLdrCommand ninja_test --gtest_filter=-SubprocessTest.* |
| 41 } | 41 } |
| 42 | 42 |
| 43 InstallStep() { | 43 InstallStep() { |
| 44 MakeDir ${PUBLISH_DIR} | 44 MakeDir ${PUBLISH_DIR} |
| 45 MakeDir ${PUBLISH_DIR}/${NACL_ARCH} | 45 MakeDir ${PUBLISH_DIR}/${NACL_ARCH} |
| 46 LogExecute cp ninja ${PUBLISH_DIR}/${NACL_ARCH}/ninja | 46 LogExecute cp ninja ${PUBLISH_DIR}/${NACL_ARCH}/ninja |
| 47 PublishByArchForDevEnv | 47 PublishByArchForDevEnv |
| 48 } | 48 } |
| OLD | NEW |