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

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

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 1 month 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
OLDNEW
1 # Copyright (c) 2015 The Native Client Authors. All rights reserved. 1 # Copyright (c) 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 # falling back to cc for generating build time artifacts 5 # falling back to cc for generating build time artifacts
6 export BUILD_CC=cc 6 export BUILD_CC=cc
7 export BUILD_LD=cc 7 export BUILD_LD=cc
8 # use -Wno-return-type to suppress return-type errors encountered 8 # use -Wno-return-type to suppress return-type errors encountered
9 # with pnacl, arm's clang-newlib (microperl) 9 # with pnacl, arm's clang-newlib (microperl)
10 NACLPORTS_CFLAGS_MICRO=$NACLPORTS_CFLAGS 10 NACLPORTS_CFLAGS_MICRO=$NACLPORTS_CFLAGS
11 NACLPORTS_CFLAGS_MICRO+=" -Dmain=nacl_main -Wno-return-type " 11 NACLPORTS_CFLAGS_MICRO+=" -Wno-return-type "
12 NACLPORTS_CFLAGS+=" -I${NACL_SDK_ROOT}/include -I${NACLPORTS_INCLUDE} \ 12 NACLPORTS_CFLAGS+=" -I${NACL_SDK_ROOT}/include -I${NACLPORTS_INCLUDE} \
13 -Wno-return-type" 13 -Wno-return-type"
14 BUILD_DIR=${SRC_DIR} 14 BUILD_DIR=${SRC_DIR}
15 # keeping microperl for now 15 # keeping microperl for now
16 EXECUTABLES="perl microperl" 16 EXECUTABLES="perl microperl"
17 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}" 17 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LDFLAGS}"
18 # we need a working perl on host to build things for target 18 # we need a working perl on host to build things for target
19 HOST_BUILD=${WORK_DIR}/build_host 19 HOST_BUILD=${WORK_DIR}/build_host
20 ARCH_DIR=${PUBLISH_DIR}/${NACL_ARCH} 20 ARCH_DIR=${PUBLISH_DIR}/${NACL_ARCH}
21 NACLPORTS_LIBS=" ${NACL_CLI_MAIN_LIB}" 21 NACLPORTS_LIBS=" ${NACL_CLI_MAIN_LIB}"
22 # PNaCl and newlib dont have dynamic loading, so 22 # PNaCl and newlib dont have dynamic loading, so
23 # using Perl's internal stub file dl_none.xs 23 # using Perl's internal stub file dl_none.xs
24 # specifically for systems which do not support it 24 # specifically for systems which do not support it
25 # Also, FILE pointer is structured a bit differently 25 # Also, FILE pointer is structured a bit differently
26 # Relevant stdio parameters found via sel_ldr on Linux 26 # Relevant stdio parameters found via sel_ldr on Linux
27 if [ "${NACL_LIBC}" = "newlib" -o "${NACL_ARCH}" = "pnacl" ] ; then 27 if [ "${NACL_LIBC}" = "newlib" -o "${NACL_ARCH}" = "pnacl" ] ; then
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 EXPECTED=${START_DIR}/expected_${TOOLCHAIN}.txt 176 EXPECTED=${START_DIR}/expected_${TOOLCHAIN}.txt
177 if ! cmp tests_out.txt ${EXPECTED}; then 177 if ! cmp tests_out.txt ${EXPECTED}; then
178 echo "Test output did not match expected output" 178 echo "Test output did not match expected output"
179 echo "See ${PWD}/tests_err.txt" 179 echo "See ${PWD}/tests_err.txt"
180 diff -u tests_out.txt ${EXPECTED} 180 diff -u tests_out.txt ${EXPECTED}
181 exit 1 181 exit 1
182 fi 182 fi
183 183
184 echo "PASSED" 184 echo "PASSED"
185 } 185 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698