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

Side by Side Diff: ports/busybox/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
« no previous file with comments | « ports/blackbox/nacl.patch ('k') | ports/bzip2/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 EXECUTABLES="busybox" 5 EXECUTABLES="busybox"
6 6
7 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}" 7 EnableCliMain
8 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"
9 8
10 ConfigureStep() { 9 ConfigureStep() {
11 cp "${START_DIR}/defconfig" . 10 cp "${START_DIR}/defconfig" .
12 11
13 if [ "${TOOLCHAIN}" = "glibc" -a "${NACL_ARCH}" = "arm" ]; then 12 if [ "${TOOLCHAIN}" = "glibc" -a "${NACL_ARCH}" = "arm" ]; then
14 echo "CONFIG_INIT=n" >> defconfig 13 echo "CONFIG_INIT=n" >> defconfig
15 echo "CONFIG_LINEEDIT=n" >> defconfig 14 echo "CONFIG_LINEEDIT=n" >> defconfig
16 echo "CONFIG_FEATURE_UTMP=n" >> defconfig 15 echo "CONFIG_FEATURE_UTMP=n" >> defconfig
17 echo "CONFIG_FEATURE_VI_USE_SIGNALS=n" >> defconfig 16 echo "CONFIG_FEATURE_VI_USE_SIGNALS=n" >> defconfig
18 fi 17 fi
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 if [[ ${TOOLCHAIN} = pnacl ]]; then 54 if [[ ${TOOLCHAIN} = pnacl ]]; then
56 return 55 return
57 fi 56 fi
58 57
59 # Simple test of "cat" command to ensure basic functionality 58 # Simple test of "cat" command to ensure basic functionality
60 # TODO(sbc): run the full test suite 59 # TODO(sbc): run the full test suite
61 echo "Running ./busybox.sh cat busybox.sh > test.out" 60 echo "Running ./busybox.sh cat busybox.sh > test.out"
62 $(./busybox.sh cat busybox.sh > test.out) 61 $(./busybox.sh cat busybox.sh > test.out)
63 LogExecute diff -u busybox.sh test.out 62 LogExecute diff -u busybox.sh test.out
64 } 63 }
OLDNEW
« no previous file with comments | « ports/blackbox/nacl.patch ('k') | ports/bzip2/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698