| OLD | NEW |
| 1 # Copyright 2015 The Native Client Authors. All rights reserved. | 1 # Copyright 2015 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 if [ "${TOOLCHAIN}" = "pnacl" -o "${TOOLCHAIN}" = "clang-newlib" ]; then | 5 if [ "${TOOLCHAIN}" = "pnacl" -o "${TOOLCHAIN}" = "clang-newlib" ]; then |
| 6 export CC_FOR_BUILD=clang | 6 export CC_FOR_BUILD=clang |
| 7 else | 7 else |
| 8 export CC_FOR_BUILD=gcc | 8 export CC_FOR_BUILD=gcc |
| 9 fi | 9 fi |
| 10 | 10 |
| 11 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" | 11 EnableCliMain |
| 12 export LIBS="${NACL_CLI_MAIN_LIB}" | |
| 13 | 12 |
| 14 EXECUTABLES="tshark${NACL_EXEEXT}" | 13 EXECUTABLES="tshark${NACL_EXEEXT}" |
| 15 | 14 |
| 16 EXTRA_CONFIGURE_ARGS=" | 15 EXTRA_CONFIGURE_ARGS=" |
| 17 --enable-extra-compiler-warnings | 16 --enable-extra-compiler-warnings |
| 18 --disable-wireshark | 17 --disable-wireshark |
| 19 --disable-editcap | 18 --disable-editcap |
| 20 --disable-capinfos | 19 --disable-capinfos |
| 21 --disable-captype | 20 --disable-captype |
| 22 --disable-mergecap | 21 --disable-mergecap |
| 23 --disable-reordercap | 22 --disable-reordercap |
| 24 --disable-text2pcap | 23 --disable-text2pcap |
| 25 --disable-dftest | 24 --disable-dftest |
| 26 --disable-randpkt | 25 --disable-randpkt |
| 27 --disable-dumpcap | 26 --disable-dumpcap |
| 28 --disable-rawshark | 27 --disable-rawshark |
| 29 --disable-ipv6 | 28 --disable-ipv6 |
| 30 --without-gcrypt | 29 --without-gcrypt |
| 31 --without-plugins | 30 --without-plugins |
| 32 --without-pcap | 31 --without-pcap |
| 33 --without-zlib | 32 --without-zlib |
| 34 --disable-glibtest | 33 --disable-glibtest |
| 35 --disable-gtktest | 34 --disable-gtktest |
| 36 " | 35 " |
| OLD | NEW |