diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-10 09:39:17 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-10 09:39:17 +0000 |
commit | c541ff32238e10e25e4f3a220277a9bd3c882cc6 (patch) | |
tree | 8b83195646662f2d7ea176ec5287c1cd04100acd /configure.in | |
parent | 8706c00dfd65ae6c78f6fdac3688b224925c8d49 (diff) | |
download | ruby-c541ff32238e10e25e4f3a220277a9bd3c882cc6.tar.gz |
* configure.in (RUBY_NACL): Warns if $PATH does not contain the path
to NativeClient SDK. PATH variable redefinition in GNUmakefile does
not work for GNU make 3.81.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 973445f56f..d88d286691 100644 --- a/configure.in +++ b/configure.in @@ -108,9 +108,17 @@ AC_DEFUN([RUBY_NACL], if test -z "${NACL_TOOLCHAIN}"; then AC_MSG_ERROR([Unrecognized --host and --build combination or NaCl SDK is not installed]) fi - PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" AC_MSG_RESULT(${NACL_TOOLCHAIN}) + AC_MSG_CHECKING([path to SDK]) + if echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then + AC_MSG_RESULT([set]) + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Add "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" to \$PATH]) + PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" + fi + AC_SUBST(NACL_TOOLCHAIN) AC_SUBST(NACL_SDK_ROOT) AC_SUBST(NACL_SDK_VARIANT, nacl_cv_build_variant) |