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

Side by Side Diff: examples/graphics/xaos/nacl-xaos.sh

Issue 11636027: Add ARM toolchain support. (Closed) Base URL: git@github.com:samclegg/naclports.git@sbc
Patch Set: revert .c file change Created 7 years, 11 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 | « examples/graphics/photo_c_salt/Makefile ('k') | examples/graphics/xaos/xaos.nmf » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # 5 #
6 6
7 # nacl-xaos.sh 7 # nacl-xaos.sh
8 # 8 #
9 # usage: nacl-xoas.sh 9 # usage: nacl-xoas.sh
10 # 10 #
(...skipping 25 matching lines...) Expand all
36 36
37 # export the nacl tools 37 # export the nacl tools
38 export CC=${NACLCC} 38 export CC=${NACLCC}
39 export CXX=${NACLCXX} 39 export CXX=${NACLCXX}
40 # NOTE: non-standard flag NACL_LDFLAGS because of some more hacking below 40 # NOTE: non-standard flag NACL_LDFLAGS because of some more hacking below
41 export CFLAGS="-g -D__NO_MATH_INLINES=1" 41 export CFLAGS="-g -D__NO_MATH_INLINES=1"
42 export LDFLAGS="-Wl,--undefined=PPP_GetInterface \ 42 export LDFLAGS="-Wl,--undefined=PPP_GetInterface \
43 -Wl,--undefined=PPP_ShutdownModule \ 43 -Wl,--undefined=PPP_ShutdownModule \
44 -Wl,--undefined=PPP_InitializeModule \ 44 -Wl,--undefined=PPP_InitializeModule \
45 -Wl,--undefined=original_main" 45 -Wl,--undefined=original_main"
46 if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ] ; then 46 if [ ${NACL_ARCH} = "pnacl" ] ; then
47 export CFLAGS="${CFLAGS} -O3" 47 export CFLAGS="${CFLAGS} -O3"
48 export LDFLAGS="${LDFLAGS} -O0 -static" 48 export LDFLAGS="${LDFLAGS} -O0 -static"
49 else 49 else
50 export CFLAGS="${CFLAGS} -O2" 50 export CFLAGS="${CFLAGS} -O2"
51 fi 51 fi
52 export AR=${NACLAR} 52 export AR=${NACLAR}
53 export RANLIB=${NACLRANLIB} 53 export RANLIB=${NACLRANLIB}
54 export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig 54 export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig
55 export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB} 55 export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB}
56 56
(...skipping 21 matching lines...) Expand all
78 rm ./configure 78 rm ./configure
79 autoconf 79 autoconf
80 echo "Configure options: ${CONFIG_FLAGS}" 80 echo "Configure options: ${CONFIG_FLAGS}"
81 ./configure ${CONFIG_FLAGS} 81 ./configure ${CONFIG_FLAGS}
82 } 82 }
83 83
84 CustomInstallStep(){ 84 CustomInstallStep(){
85 local out_dir=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME} 85 local out_dir=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
86 local build_dir=${out_dir}/${PACKAGE_NAME}-build 86 local build_dir=${out_dir}/${PACKAGE_NAME}-build
87 local publish_dir="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}" 87 local publish_dir="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}"
88 local arch=${NACL_PACKAGES_BITSIZE}
89 if [[ "${arch}" != "pnacl" ]] ; then
90 arch="x86-${arch}"
91 fi
92 88
93 MakeDir ${publish_dir} 89 MakeDir ${publish_dir}
94 install ${START_DIR}/xaos.html ${publish_dir} 90 install ${START_DIR}/xaos.html ${publish_dir}
95 install ${START_DIR}/xaos.nmf ${publish_dir} 91 install ${START_DIR}/xaos.nmf ${publish_dir}
96 # Not used yet 92 # Not used yet
97 install ${build_dir}/help/xaos.hlp ${publish_dir} 93 install ${build_dir}/help/xaos.hlp ${publish_dir}
98 install ${build_dir}/bin/xaos ${publish_dir}/xaos_${arch}.nexe 94 install ${build_dir}/bin/xaos ${publish_dir}/xaos_${NACL_ARCH}.nexe
99 DefaultTouchStep 95 DefaultTouchStep
100 } 96 }
101 97
102 CustomPackageInstall() { 98 CustomPackageInstall() {
103 DefaultPreInstallStep 99 DefaultPreInstallStep
104 DefaultDownloadStep 100 DefaultDownloadStep
105 DefaultExtractStep 101 DefaultExtractStep
106 CustomPatchStep 102 CustomPatchStep
107 CustomConfigureStep 103 CustomConfigureStep
108 DefaultBuildStep 104 DefaultBuildStep
109 if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ] ; then 105 if [ ${NACL_ARCH} = "pnacl" ] ; then
110 DefaultTranslateStep ${PACKAGE_NAME} ${PACKAGE_NAME}-build/bin/xaos 106 DefaultTranslateStep ${PACKAGE_NAME} ${PACKAGE_NAME}-build/bin/xaos
111 fi 107 fi
112 CustomInstallStep 108 CustomInstallStep
113 DefaultCleanUpStep 109 DefaultCleanUpStep
114 } 110 }
115 111
116 CustomPackageInstall 112 CustomPackageInstall
117 exit 0 113 exit 0
OLDNEW
« no previous file with comments | « examples/graphics/photo_c_salt/Makefile ('k') | examples/graphics/xaos/xaos.nmf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698