| 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" | 7 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" |
| 8 export LIBS="-lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}" | 8 export LIBS="-lX11 -lxcb -lXau ${NACL_CLI_MAIN_LIB}" |
| 9 | 9 |
| 10 EXTRA_CONFIGURE_ARGS+=" --with-tcl=${NACLPORTS_LIBDIR}" | 10 EXTRA_CONFIGURE_ARGS+=" --with-tcl=${NACLPORTS_LIBDIR}" |
| 11 | 11 |
| 12 if [ "${NACL_ARCH}" = "pnacl" ]; then | 12 if [ "${NACL_ARCH}" = "pnacl" ]; then |
| 13 EXTRA_CONFIGURE_ARGS+=" --disable-load" | 13 EXTRA_CONFIGURE_ARGS+=" --disable-load" |
| 14 fi | 14 fi |
| 15 | 15 |
| 16 # Disable fallbacks for broken libc's that kick in for | 16 # Disable fallbacks for broken libc's that kick in for |
| 17 # cross-compiles since autoconf can't run target binaries. | 17 # cross-compiles since autoconf can't run target binaries. |
| 18 # The fallbacks seem to be non-general. | 18 # The fallbacks seem to be non-general. |
| 19 export tcl_cv_strtod_buggy=ok | 19 export tcl_cv_strtod_buggy=ok |
| 20 | 20 |
| 21 if [ "${NACL_LIBC}" = "newlib" ]; then | 21 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 22 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" | 22 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" |
| 23 LIBS+=" -lglibc-compat" | 23 LIBS+=" -lglibc-compat" |
| 24 fi | 24 fi |
| 25 | 25 |
| 26 # Ideally we would only add this flag for newlib builds but | 26 # Ideally we would only add this flag for newlib builds but |
| 27 # linking of the shared library currently fails because it | 27 # linking of the shared library currently fails because it |
| 28 # tries to link libppapi_stub.a which is not built with -fPIC. | 28 # tries to link libppapi_stub.a which is not built with -fPIC. |
| 29 EXTRA_CONFIGURE_ARGS+=" --disable-shared" | 29 EXTRA_CONFIGURE_ARGS+=" --disable-shared" |
| 30 | |
| 31 PublishStep() { | |
| 32 PublishByArchForDevEnv | |
| 33 } | |
| OLD | NEW |