| OLD | NEW |
| 1 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2013 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 | 5 |
| 6 EXTRA_CONFIGURE_ARGS="--with-curses" | 6 EXTRA_CONFIGURE_ARGS="--with-curses" |
| 7 EXTRA_CONFIGURE_ARGS+=" --with-installed-readline --enable-readline" | 7 EXTRA_CONFIGURE_ARGS+=" --with-installed-readline --enable-readline" |
| 8 NACLPORTS_CPPFLAGS+=" -DHAVE_GETHOSTNAME -DNO_MAIN_ENV_ARG" | 8 NACLPORTS_CPPFLAGS+=" -DHAVE_GETHOSTNAME -DNO_MAIN_ENV_ARG" |
| 9 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" | 9 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" |
| 10 export LIBS+="${NACL_CLI_MAIN_LIB} \ | 10 export LIBS+="${NACL_CLI_MAIN_LIB} \ |
| 11 -lppapi_simple -lnacl_spawn -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}" | 11 -lppapi_simple -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}" |
| 12 | 12 |
| 13 # Configure requires this variable to be pre-set when cross compiling. | 13 # Configure requires this variable to be pre-set when cross compiling. |
| 14 export bash_cv_getcwd_malloc=yes | 14 export bash_cv_getcwd_malloc=yes |
| 15 | 15 |
| 16 if [ "${NACL_LIBC}" = "newlib" ]; then | 16 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 17 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" | 17 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" |
| 18 export LIBS+=" -lglibc-compat" | 18 export LIBS+=" -lglibc-compat" |
| 19 fi | 19 fi |
| 20 | 20 |
| 21 PatchStep() { | 21 PatchStep() { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 42 ${exe} -s . -o bash.nmf | 42 ${exe} -s . -o bash.nmf |
| 43 else | 43 else |
| 44 local exe="${platform_dir}/bash${NACL_EXEEXT}" | 44 local exe="${platform_dir}/bash${NACL_EXEEXT}" |
| 45 LogExecute cp ${BUILD_DIR}/bash${NACL_EXEEXT} ${exe} | 45 LogExecute cp ${BUILD_DIR}/bash${NACL_EXEEXT} ${exe} |
| 46 ChangeDir ${ASSEMBLY_DIR} | 46 ChangeDir ${ASSEMBLY_DIR} |
| 47 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | 47 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ |
| 48 _platform_specific/*/bash*${NACL_EXEEXT} \ | 48 _platform_specific/*/bash*${NACL_EXEEXT} \ |
| 49 -s . -o bash.nmf | 49 -s . -o bash.nmf |
| 50 fi | 50 fi |
| 51 } | 51 } |
| OLD | NEW |