OLD | NEW |
---|---|
(Empty) | |
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 | |
3 # found in the LICENSE file. | |
4 | |
5 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" | |
6 export LIBS="${NACL_CLI_MAIN_LIB} \ | |
7 -lppapi_simple -lnacl_io -lppapi -l${NACL_CXX_LIB}" | |
Sam Clegg
2015/08/25 18:25:30
Just NACL_CLI_MAIN_LIB
| |
8 | |
9 EXTRA_CONFIGURE_ARGS=" --disable-tool-name-check --disable-system-torrc \ | |
10 --disable-gcc-hardening --disable-unittests" | |
11 | |
12 ConfigureStep() { | |
13 # TODO(dt) fix the problem in (explicit) static linking of openssl | |
14 # and libevent when TOOLCHAIN=glibc | |
15 if [ "${NACL_LIBC}" = "newlib" ]; then | |
16 EXTRA_CONFIGURE_ARGS+=" --enable-static-tor \ | |
17 --enable-static-libevent --with-libevent-dir=${NACL_PREFIX} \ | |
18 --enable-static-openssl --with-openssl-dir=${NACL_PREFIX} \ | |
19 --enable-static-zlib --with-zlib-dir=${NACL_PREFIX}" | |
20 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" | |
21 export LIBS+=" -lglibc-compat" | |
22 fi | |
23 | |
24 # building with NDEBUG not allowed | |
25 NACLPORTS_CFLAGS="${NACLPORTS_CFLAGS/-DNDEBUG/}" | |
26 DefaultConfigureStep | |
27 } | |
28 | |
29 PublishStep() { | |
30 MakeDir ${PUBLISH_DIR} | |
31 local platform_dir="${PUBLISH_DIR}/_platform_specific/${NACL_ARCH}" | |
32 MakeDir ${platform_dir} | |
33 local exe=${PUBLISH_DIR}/_platform_specific/${NACL_ARCH}/tor${NACL_EXEEXT} | |
34 LogExecute cp ${BUILD_DIR}/src/or/tor${NACL_EXEEXT} ${exe} | |
35 cd ${PUBLISH_DIR} | |
36 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | |
37 _platform_specific/*/tor${NACL_EXEEXT} \ | |
Sam Clegg
2015/08/25 18:25:30
Indent the continuation 4 spaces
| |
38 -s . \ | |
39 -o tor.nmf | |
Sam Clegg
2015/08/25 18:25:30
Looks like these two lines will fit on the precedi
| |
40 InstallNaClTerm ${PUBLISH_DIR} | |
41 LogExecute cp ${START_DIR}/krotor_16.png ${PUBLISH_DIR} | |
42 LogExecute cp ${START_DIR}/krotor_48.png ${PUBLISH_DIR} | |
43 LogExecute cp ${START_DIR}/krotor_128.png ${PUBLISH_DIR} | |
44 GenerateManifest ${START_DIR}/manifest.json ${PUBLISH_DIR} | |
45 LogExecute cp ${START_DIR}/background.js ${PUBLISH_DIR} | |
46 LogExecute cp ${START_DIR}/tor.js ${PUBLISH_DIR} | |
47 LogExecute cp ${START_DIR}/index.html ${PUBLISH_DIR} | |
48 } | |
OLD | NEW |