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

Side by Side Diff: build_tools/nacl-env.sh

Issue 1399633002: Add emscripten support to config.sub (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@hello_emscripten
Patch Set: Created 5 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 | « build_tools/config.sub ('k') | ports/zlib/diff_skip.txt » ('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) 2013 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2013 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 # Echo the environment variables need to to build/configure standard 6 # Echo the environment variables need to to build/configure standard
7 # GNU make/automake/configure projects. e.g. CC, CXX, CFLAGS, etc. 7 # GNU make/automake/configure projects. e.g. CC, CXX, CFLAGS, etc.
8 # The values for these variables are calculated based on the following 8 # The values for these variables are calculated based on the following
9 # environment variables: 9 # environment variables:
10 # 10 #
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 export NACL_ARCH_ALT=x86_32 141 export NACL_ARCH_ALT=x86_32
142 else 142 else
143 export NACL_ARCH_ALT=${NACL_ARCH} 143 export NACL_ARCH_ALT=${NACL_ARCH}
144 fi 144 fi
145 145
146 # NACL_CROSS_PREFIX is the prefix of the executables in the 146 # NACL_CROSS_PREFIX is the prefix of the executables in the
147 # toolchain's "bin" directory. For example: i686-nacl-<toolname>. 147 # toolchain's "bin" directory. For example: i686-nacl-<toolname>.
148 if [ ${NACL_ARCH} = "pnacl" ]; then 148 if [ ${NACL_ARCH} = "pnacl" ]; then
149 NACL_CROSS_PREFIX=pnacl 149 NACL_CROSS_PREFIX=pnacl
150 elif [ ${NACL_ARCH} = "emscripten" ]; then 150 elif [ ${NACL_ARCH} = "emscripten" ]; then
151 NACL_CROSS_PREFIX=em 151 NACL_CROSS_PREFIX=emscripten
152 else 152 else
153 NACL_CROSS_PREFIX=${NACL_ARCH}-nacl 153 NACL_CROSS_PREFIX=${NACL_ARCH}-nacl
154 fi 154 fi
155 155
156 export NACL_LIBC 156 export NACL_LIBC
157 export NACL_ARCH 157 export NACL_ARCH
158 export NACL_CROSS_PREFIX 158 export NACL_CROSS_PREFIX
159 159
160 InitializeNaClGccToolchain() { 160 InitializeNaClGccToolchain() {
161 if [ ${NACL_ARCH} = "arm" ]; then 161 if [ ${NACL_ARCH} = "arm" ]; then
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 echo "export PATH=${NACL_PREFIX}/bin:\${PATH}:${NACL_BIN_PATH}" 344 echo "export PATH=${NACL_PREFIX}/bin:\${PATH}:${NACL_BIN_PATH}"
345 echo "export CPPFLAGS=\"${NACL_CPPFLAGS}\"" 345 echo "export CPPFLAGS=\"${NACL_CPPFLAGS}\""
346 echo "export ARFLAGS=\"${NACL_ARFLAGS}\"" 346 echo "export ARFLAGS=\"${NACL_ARFLAGS}\""
347 echo "export LDFLAGS=\"${NACL_LDFLAGS}\"" 347 echo "export LDFLAGS=\"${NACL_LDFLAGS}\""
348 else 348 else
349 NaClEnvExport 349 NaClEnvExport
350 exec "$@" 350 exec "$@"
351 fi 351 fi
352 fi 352 fi
353 fi 353 fi
OLDNEW
« no previous file with comments | « build_tools/config.sub ('k') | ports/zlib/diff_skip.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698