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

Unified Diff: build_tools/nacl_env.sh

Issue 132343007: Add top level build script for building packages. (Closed) Base URL: https://naclports.googlecode.com/svn/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build_tools/common.sh ('k') | build_tools/naclports.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_tools/nacl_env.sh
diff --git a/build_tools/nacl_env.sh b/build_tools/nacl_env.sh
index 138418451934bde93c3f03e174761befb043edbc..ba5b1ea9b1343232cf02f8d8119e48b90597f2ef 100755
--- a/build_tools/nacl_env.sh
+++ b/build_tools/nacl_env.sh
@@ -270,26 +270,28 @@ if [ ${NACL_GLIBC} = "1" ]; then
NACL_LDFLAGS+=" -Wl,-rpath-link=${NACL_SDK_LIBDIR}"
fi
-if [ $# -gt 0 ]; then
- if [ "$1" = '--print' ]; then
- echo "export CC=${NACLCC}"
- echo "export CXX=${NACLCXX}"
- echo "export AR=${NACLAR}"
- echo "export RANLIB=${NACLRANLIB}"
- echo "export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig"
- echo "export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}"
- echo "export PATH=\${PATH}:${NACL_BIN_PATH}"
- echo "export CFLAGS=\"${NACL_CFLAGS}\""
- echo "export LDFLAGS=\"${NACL_LDFLAGS}\""
- else
- export CC=${NACLCC}
- export CXX=${NACLCXX}
- export AR=${NACLAR}
- export RANLIB=${NACLRANLIB}
- export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
- export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
- export PATH=${PATH}:${NACL_BIN_PATH}
- export CFLAGS=${NACL_CFLAGS}
- exec $@
+if [ -z "${NACL_ENV_IMPORT:-}" ]; then
+ if [ $# -gt 0 ]; then
+ if [ "$1" = '--print' ]; then
+ echo "export CC=${NACLCC}"
+ echo "export CXX=${NACLCXX}"
+ echo "export AR=${NACLAR}"
+ echo "export RANLIB=${NACLRANLIB}"
+ echo "export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig"
+ echo "export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}"
+ echo "export PATH=\${PATH}:${NACL_BIN_PATH}"
+ echo "export CFLAGS=\"${NACL_CFLAGS}\""
+ echo "export LDFLAGS=\"${NACL_LDFLAGS}\""
+ else
+ export CC=${NACLCC}
+ export CXX=${NACLCXX}
+ export AR=${NACLAR}
+ export RANLIB=${NACLRANLIB}
+ export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
+ export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
+ export PATH=${PATH}:${NACL_BIN_PATH}
+ export CFLAGS=${NACL_CFLAGS}
+ exec $@
+ fi
fi
fi
« no previous file with comments | « build_tools/common.sh ('k') | build_tools/naclports.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698