| 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 NACL_CONFIGURE_PATH=${SRC_DIR}/unix/configure | 5 NACL_CONFIGURE_PATH=${SRC_DIR}/unix/configure |
| 6 | 6 |
| 7 NACLPORTS_CPPFLAGS="-Dmain=nacl_main" | |
| 8 | |
| 9 export LIBS="${NACL_CLI_MAIN_LIB}" | |
| 10 | |
| 11 MAKE_TARGETS="binaries" | 7 MAKE_TARGETS="binaries" |
| 12 INSTALL_TARGETS="install-binaries" | 8 INSTALL_TARGETS="install-binaries" |
| 13 | 9 |
| 14 # Disable fallbacks for broken libc's that kick in for | 10 # Disable fallbacks for broken libc's that kick in for |
| 15 # cross-compiles since autoconf can't run target binaries. | 11 # cross-compiles since autoconf can't run target binaries. |
| 16 # The fallbacks seem to be non-general. | 12 # The fallbacks seem to be non-general. |
| 17 export tcl_cv_strtod_buggy=ok | 13 export tcl_cv_strtod_buggy=ok |
| 18 export ac_cv_func_strtod=yes | 14 export ac_cv_func_strtod=yes |
| 19 export ac_cv_func_memmove=yes | 15 export ac_cv_func_memmove=yes |
| 20 export tcl_cv_strtod_unbroken=ok | 16 export tcl_cv_strtod_unbroken=ok |
| 21 | 17 |
| 22 # Prevent non-cross compile clean parts of the build from assuming the host | 18 # Prevent non-cross compile clean parts of the build from assuming the host |
| 23 # system influences things (needed for OSX). | 19 # system influences things (needed for OSX). |
| 24 export tcl_cv_sys_version=Generic | 20 export tcl_cv_sys_version=Generic |
| 25 | 21 |
| 26 if [ "${NACL_SHARED}" = "1" ]; then | 22 if [[ ${NACL_SHARED} == 1 ]]; then |
| 27 NACLPORTS_CFLAGS+=" -fPIC" | 23 NACLPORTS_CFLAGS+=" -fPIC" |
| 24 # Without this some of the configure tests fail with: |
| 25 # ld: conftest: hidden symbol `main' in /tmp/ccQC0Erg.o is referenced by DSO |
| 26 export tcl_cv_cc_visibility_hidden=no |
| 28 fi | 27 fi |
| 29 | 28 |
| 29 EnableCliMain |
| 30 EnableGlibcCompat | 30 EnableGlibcCompat |
| 31 | 31 |
| 32 if [ "${NACL_LIBC}" = "newlib" ]; then | 32 if [[ ${NACL_LIBC} == newlib ]]; then |
| 33 NACLPORTS_CPPFLAGS+=" -DHAVE_STRLCPY=1" | 33 NACLPORTS_CPPFLAGS+=" -DHAVE_STRLCPY=1" |
| 34 EXTRA_CONFIGURE_ARGS+=" --enable-shared=no" | 34 EXTRA_CONFIGURE_ARGS+=" --enable-shared=no" |
| 35 EXTRA_CONFIGURE_ARGS+=" --enable-load=no" | 35 EXTRA_CONFIGURE_ARGS+=" --enable-load=no" |
| 36 export tcl_cv_strtoul_unbroken=ok | 36 export tcl_cv_strtoul_unbroken=ok |
| 37 fi | 37 fi |
| 38 | 38 |
| 39 if [ "${NACL_LIBC}" = "bionic" ]; then | 39 if [[ ${NACL_LIBC} == bionic ]]; then |
| 40 NACLPORTS_CPPFLAGS+=" -DHAVE_STRLCPY=1" | 40 NACLPORTS_CPPFLAGS+=" -DHAVE_STRLCPY=1" |
| 41 fi | 41 fi |
| OLD | NEW |