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

Side by Side Diff: ports/nacl-spawn/build.sh

Issue 627103003: Add shared library version of libcli_main Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 6 years, 2 months 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/nacl-spawn/bsd_spawn.h ('k') | ports/nacl-spawn/elf_reader.h » ('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 NACLPORTS_CPPFLAGS+=" -I ${START_DIR}" 5 NACLPORTS_CPPFLAGS+=" -I${START_DIR}/include -Wall -Werror"
6 6
7 ConfigureStep() { 7 ConfigureStep() {
8 MakeDir ${BUILD_DIR} 8 MakeDir ${BUILD_DIR}
9 cp -rf ${START_DIR}/* ${BUILD_DIR} 9 cp -rf ${START_DIR}/* ${BUILD_DIR}
10 } 10 }
11 11
12 BuildStep() { 12 BuildStep() {
13 MAKE_TARGETS="libcli_main.a libnacl_spawn.a" 13 MAKE_TARGETS="libcli_main.a libnacl_spawn.a"
14 if [ "${NACL_LIBC}" = "glibc" -o "${NACL_LIBC}" = "bionic" ]; then 14 if [ "${NACL_LIBC}" = "glibc" -o "${NACL_LIBC}" = "bionic" ]; then
15 NACLPORTS_CFLAGS+=" -fPIC" 15 NACLPORTS_CFLAGS+=" -fPIC"
16 NACLPORTS_CXXFLAGS+=" -fPIC" 16 NACLPORTS_CXXFLAGS+=" -fPIC"
17 MAKE_TARGETS+=" libnacl_spawn.so" 17 MAKE_TARGETS+=" libnacl_spawn.so"
18 MAKE_TARGETS+=" libcli_main.so"
18 fi 19 fi
19 20
20 if [ "${NACL_LIBC}" = "glibc" ]; then 21 if [ "${NACL_LIBC}" = "glibc" ]; then
21 MAKE_TARGETS+=" test" 22 MAKE_TARGETS+=" test"
22 else 23 else
23 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" 24 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
24 fi 25 fi
25 26
26 MAKEFLAGS+=" TOOLCHAIN=${TOOLCHAIN}" 27 MAKEFLAGS+=" TOOLCHAIN=${TOOLCHAIN}"
27 MAKEFLAGS+=" NACL_ARCH=${NACL_ARCH_ALT}" 28 MAKEFLAGS+=" NACL_ARCH=${NACL_ARCH_ALT}"
28 export CFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CFLAGS}" 29 export CFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CFLAGS}"
29 export CXXFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CXXFLAGS}" 30 export CXXFLAGS="${NACLPORTS_CPPFLAGS} ${NACLPORTS_CXXFLAGS}"
30 DefaultBuildStep 31 DefaultBuildStep
31 } 32 }
32 33
33 InstallStep() { 34 InstallStep() {
34 MakeDir ${DESTDIR_LIB} 35 MakeDir ${DESTDIR_LIB}
35 LogExecute cp libnacl_spawn.a ${DESTDIR_LIB} 36 LogExecute cp libnacl_spawn.a ${DESTDIR_LIB}
36 if [ "${NACL_LIBC}" = "glibc" -o "${NACL_LIBC}" = "bionic" ]; then 37 if [ "${NACL_LIBC}" = "glibc" -o "${NACL_LIBC}" = "bionic" ]; then
37 LogExecute cp libnacl_spawn.so ${DESTDIR_LIB} 38 LogExecute cp libnacl_spawn.so ${DESTDIR_LIB}
39 LogExecute cp libcli_main.so ${DESTDIR_LIB}
38 fi 40 fi
39 LogExecute cp libcli_main.a ${DESTDIR_LIB} 41 LogExecute cp libcli_main.a ${DESTDIR_LIB}
40 MakeDir ${DESTDIR_INCLUDE} 42 MakeDir ${DESTDIR_INCLUDE}
41 LogExecute cp -f ${START_DIR}/spawn.h ${DESTDIR_INCLUDE}/ 43 LogExecute cp -f ${START_DIR}/include/spawn.h ${DESTDIR_INCLUDE}/
42 LogExecute cp -f ${START_DIR}/nacl_main.h ${DESTDIR_INCLUDE}/ 44 LogExecute cp -f ${START_DIR}/include/nacl_main.h ${DESTDIR_INCLUDE}/
43 if [ $TOOLCHAIN = bionic ]; then 45 if [ $TOOLCHAIN = bionic ]; then
44 LogExecute cp -f ${START_DIR}/bsd_spawn.h ${DESTDIR_INCLUDE}/ 46 LogExecute cp -f ${START_DIR}/include/bsd_spawn.h ${DESTDIR_INCLUDE}/
45 fi 47 fi
46 } 48 }
OLDNEW
« no previous file with comments | « ports/nacl-spawn/bsd_spawn.h ('k') | ports/nacl-spawn/elf_reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698