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

Side by Side Diff: ports/toybox/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) 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="toybox" 5 EXECUTABLES="toybox"
6 6
7 # Toybox wants to build in its current directory. 7 # Toybox wants to build in its current directory.
8 BUILD_DIR=${SRC_DIR} 8 BUILD_DIR=${SRC_DIR}
9 9
10 NACLPORTS_CPPFLAGS+=" -DBYTE_ORDER=LITTLE_ENDIAN" 10 NACLPORTS_CPPFLAGS+=" -DBYTE_ORDER=LITTLE_ENDIAN"
11 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main"
12 NACLPORTS_CPPFLAGS+=" -Dpipe=nacl_spawn_pipe" 11 NACLPORTS_CPPFLAGS+=" -Dpipe=nacl_spawn_pipe"
13 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}" 12 NACLPORTS_LDFLAGS+=" ${NACL_CLI_MAIN_LIB}"
binji 2015/10/27 21:52:38 and here
Sam Clegg 2015/10/28 17:06:31 Done.
14 13
15 export HOSTCC=cc 14 export HOSTCC=cc
16 15
17 EnableGlibcCompat 16 EnableGlibcCompat
18 17
19 NACLPORTS_LDFLAGS+=" -l${NACL_CXX_LIB}" 18 NACLPORTS_LDFLAGS+=" -l${NACL_CXX_LIB}"
20 19
21 ConfigureStep() { 20 ConfigureStep() {
22 LogExecute cp ${START_DIR}/toybox.config ${SRC_DIR}/.config 21 LogExecute cp ${START_DIR}/toybox.config ${SRC_DIR}/.config
23 } 22 }
(...skipping 30 matching lines...) Expand all
54 LogExecute python ${TOOLS_DIR}/create_term.py toybox.nmf 53 LogExecute python ${TOOLS_DIR}/create_term.py toybox.nmf
55 54
56 InstallNaClTerm ${ASSEMBLY_DIR} 55 InstallNaClTerm ${ASSEMBLY_DIR}
57 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR} 56 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR}
58 LogExecute cp ${START_DIR}/icon_16.png ${ASSEMBLY_DIR} 57 LogExecute cp ${START_DIR}/icon_16.png ${ASSEMBLY_DIR}
59 LogExecute cp ${START_DIR}/icon_48.png ${ASSEMBLY_DIR} 58 LogExecute cp ${START_DIR}/icon_48.png ${ASSEMBLY_DIR}
60 LogExecute cp ${START_DIR}/icon_128.png ${ASSEMBLY_DIR} 59 LogExecute cp ${START_DIR}/icon_128.png ${ASSEMBLY_DIR}
61 ChangeDir ${PUBLISH_DIR} 60 ChangeDir ${PUBLISH_DIR}
62 CreateWebStoreZip toybox-${VERSION}.zip toybox 61 CreateWebStoreZip toybox-${VERSION}.zip toybox
63 } 62 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698