Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Side by Side Diff: ports/tcl/build.sh

Issue 907563002: Simplify cli_main (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ports/sdl/nacl.patch ('k') | ports/texlive/build.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 8
9 export LIBS+="\ 9 export LIBS+="\
10 -Wl,--undefined=nacl_main ${NACL_CLI_MAIN_LIB} \ 10 -Wl,--undefined=nacl_main ${NACL_CLI_MAIN_LIB} \
11 -lppapi_simple -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}" 11 -lppapi_simple -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}"
12 12
13 MAKE_TARGETS="binaries" 13 MAKE_TARGETS="binaries"
14 INSTALL_TARGETS="install-binaries" 14 INSTALL_TARGETS="install-binaries"
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 export ac_cv_func_strtod=yes 20 export ac_cv_func_strtod=yes
21 export ac_cv_func_memmove=yes
21 export tcl_cv_strtod_unbroken=ok 22 export tcl_cv_strtod_unbroken=ok
22 23
23 # Prevent non-cross compile clean parts of the build from assuming the host 24 # Prevent non-cross compile clean parts of the build from assuming the host
24 # system influences things (needed for OSX). 25 # system influences things (needed for OSX).
25 export tcl_cv_sys_version=Generic 26 export tcl_cv_sys_version=Generic
26 27
27 if [ "${NACL_LIBC}" = "glibc" ]; then 28 if [ "${NACL_LIBC}" = "glibc" ]; then
28 NACLPORTS_CFLAGS+=" -fPIC" 29 NACLPORTS_CFLAGS+=" -fPIC"
29 fi 30 fi
30 31
31 if [ "${NACL_LIBC}" = "newlib" ]; then 32 if [ "${NACL_LIBC}" = "newlib" ]; then
32 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" 33 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
33 NACLPORTS_CPPFLAGS+=" -DHAVE_STRLCPY=1" 34 NACLPORTS_CPPFLAGS+=" -DHAVE_STRLCPY=1"
34 EXTRA_CONFIGURE_ARGS+=" --enable-shared=no" 35 EXTRA_CONFIGURE_ARGS+=" --enable-shared=no"
35 EXTRA_CONFIGURE_ARGS+=" --enable-load=no" 36 EXTRA_CONFIGURE_ARGS+=" --enable-load=no"
36 export tcl_cv_strtoul_unbroken=ok 37 export tcl_cv_strtoul_unbroken=ok
37 LIBS+=" -lglibc-compat" 38 LIBS+=" -lglibc-compat"
38 fi 39 fi
39 40
40 if [ "${NACL_LIBC}" = "bionic" ]; then 41 if [ "${NACL_LIBC}" = "bionic" ]; then
41 NACLPORTS_CPPFLAGS+=" -DHAVE_STRLCPY=1" 42 NACLPORTS_CPPFLAGS+=" -DHAVE_STRLCPY=1"
42 fi 43 fi
OLDNEW
« no previous file with comments | « ports/sdl/nacl.patch ('k') | ports/texlive/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698