Chromium Code Reviews| Index: build_tools/nacl_env.sh |
| diff --git a/build_tools/nacl_env.sh b/build_tools/nacl_env.sh |
| index 138418451934bde93c3f03e174761befb043edbc..3c23de9e1f1653ed4302698ceb85c9699f948cd2 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" |
|
binji
2014/01/13 23:05:42
why commented?
Sam Clegg
2014/01/14 01:54:38
Its unrelated, but this is currently broken as NAC
|
| + #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 |