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

Side by Side Diff: ports/sdl-tests/build.sh

Issue 1435953002: Consistent --host and --build arguments to configure (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years 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/samba/build.sh ('k') | ports/sdl2-tests/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) 2011 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2011 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 ConfigureStep() { 5 ConfigureStep() {
6 Banner "Autogen ${PACKAGE_NAME}"
6 pushd ${SRC_DIR}/test 7 pushd ${SRC_DIR}/test
7 ./autogen.sh 8 LogExecute ./autogen.sh
8 popd 9 popd
9 10
10 Banner "Configuring ${PACKAGE_NAME}" 11 Banner "Configuring ${PACKAGE_NAME}"
11 SetupCrossEnvironment 12 SetupCrossEnvironment
12 13
13 local conf_host=${NACL_CROSS_PREFIX} 14 LIBS="$LDFLAGS"
14 if [ ${NACL_ARCH} = "pnacl" ]; then 15 LogExecute ${SRC_DIR}/test/configure \
15 # The PNaCl tools use "pnacl-" as the prefix, but config.sub 16 --host=${CONF_HOST} \
16 # does not know about "pnacl". It only knows about "le32-nacl". 17 --build=${CONF_BUILD} \
17 # Unfortunately, most of the config.subs here are so old that 18 --prefix=${PREFIX}
18 # it doesn't know about that "le32" either. So we just say "nacl".
19 conf_host="nacl"
20 fi
21
22 LIBS="$LDFLAGS" LogExecute ${SRC_DIR}/test/configure \
23 --host=${conf_host} --prefix=${PREFIX}
24 } 19 }
25 20
26 InstallStep() { 21 InstallStep() {
27 Remove ${PUBLISH_DIR} 22 Remove ${PUBLISH_DIR}
28 MakeDir ${PUBLISH_DIR} 23 MakeDir ${PUBLISH_DIR}
29 LogExecute cp *${NACL_EXEEXT} ${PUBLISH_DIR} 24 LogExecute cp *${NACL_EXEEXT} ${PUBLISH_DIR}
30 ChangeDir ${SRC_DIR}/test 25 ChangeDir ${SRC_DIR}/test
31 LogExecute cp *.bmp *.wav *.xbm *.dat *.txt ${PUBLISH_DIR} 26 LogExecute cp *.bmp *.wav *.xbm *.dat *.txt ${PUBLISH_DIR}
32 ChangeDir ${PUBLISH_DIR} 27 ChangeDir ${PUBLISH_DIR}
33 for NEXE in *${NACL_EXEEXT}; do 28 for NEXE in *${NACL_EXEEXT}; do
34 LogExecute "${NACL_SDK_ROOT}/tools/create_html.py" ${NEXE} 29 LogExecute "${NACL_SDK_ROOT}/tools/create_html.py" ${NEXE}
35 done 30 done
36 if [ ${NACL_ARCH} = "pnacl" ]; then 31 if [ ${NACL_ARCH} = "pnacl" ]; then
37 sed -i.bak 's/x-nacl/x-pnacl/' *.html 32 sed -i.bak 's/x-nacl/x-pnacl/' *.html
38 fi 33 fi
39 } 34 }
OLDNEW
« no previous file with comments | « ports/samba/build.sh ('k') | ports/sdl2-tests/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698