| 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 # subversion's build system seem to have a bug with out-of-tree builds |
| 6 # and parallel building that was causing occational flakes on the buildbots. |
| 7 # The mkdir-init target appears to be required before any object file can be |
| 8 # built but none of the object files seem to depend on this. |
| 9 OS_JOBS=1 |
| 10 |
| 5 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" | 11 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" |
| 6 | 12 |
| 7 export LIBS+=" -Wl,--undefined=nacl_main ${NACL_CLI_MAIN_LIB} -lppapi_simple \ | 13 export LIBS+=" -Wl,--undefined=nacl_main ${NACL_CLI_MAIN_LIB} -lppapi_simple \ |
| 8 -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}" | 14 -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}" |
| 9 | 15 |
| 10 EXTRA_CONFIGURE_ARGS="--with-apr=${NACL_PREFIX}" | 16 EXTRA_CONFIGURE_ARGS="--with-apr=${NACL_PREFIX}" |
| 11 EXTRA_CONFIGURE_ARGS+=" --with-apr-util=${NACL_PREFIX}" | 17 EXTRA_CONFIGURE_ARGS+=" --with-apr-util=${NACL_PREFIX}" |
| 12 EXTRA_CONFIGURE_ARGS+=" --enable-all-static" | 18 EXTRA_CONFIGURE_ARGS+=" --enable-all-static" |
| 13 | 19 |
| 14 if [ "${NACL_LIBC}" = "newlib" ]; then | 20 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 15 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" | 21 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" |
| 16 export LIBS+=" -lglibc-compat" | 22 export LIBS+=" -lglibc-compat" |
| 17 fi | 23 fi |
| 18 | 24 |
| 19 InstallStep() { | 25 InstallStep() { |
| 20 PublishByArchForDevEnv | 26 PublishByArchForDevEnv |
| 21 } | 27 } |
| 22 | 28 |
| OLD | NEW |