diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 3a0d9971cb..15281d700b 100644 --- a/configure.in +++ b/configure.in @@ -96,8 +96,12 @@ AC_DEFUN([RUBY_NACL], [yes], [nacl_cv_build_variant=newlib])]) AS_CASE(["$target_cpu"], - [x86_64|i?86], [nacl_cv_cpu_nick=x86], + [x86_64], [nacl_cv_cpu_nick=x86 + nacl_cv_cpu_nick2=x86_64], + [i?86], [nacl_cv_cpu_nick=x86 + nacl_cv_cpu_nick2=x86_32], [le32], [nacl_cv_cpu_nick=pnacl + nacl_cv_cpu_nick2=pnacl, ac_cv_exeext=.pexe], [nacl_cv_cpu_nick=$target_cpu]) AS_CASE(["$build_os"], @@ -148,9 +152,22 @@ AC_DEFUN([RUBY_NACL], fi AC_MSG_RESULT(${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin) + RUBY_APPEND_OPTIONS(XCFLAGS, '-I$(NACL_SDK_ROOT)/include') + AC_MSG_CHECKING([nacl library path]) + if test -d "${NACL_SDK_ROOT}/lib/${nacl_cv_build_variant}_${nacl_cv_cpu_nick2}/Release"; then + nacl_cv_libpath="${nacl_cv_build_variant}_${nacl_cv_cpu_nick2}" + elif test -d "${NACL_SDK_ROOT}/lib/${nacl_cv_cpu_nick2}/Release"; then + nacl_cv_libpath="${nacl_cv_cpu_nick2}" + else + AC_MSG_ERROR("not found") + fi + AC_MSG_RESULT([${nacl_cv_libpath}]) + RUBY_APPEND_OPTIONS(XLDFLAGS, '-L$(NACL_SDK_ROOT)/'"lib/${nacl_cv_libpath}/Release") + AC_SUBST(NACL_TOOLCHAIN) AC_SUBST(NACL_SDK_ROOT) - AC_SUBST(NACL_SDK_VARIANT, nacl_cv_build_variant) + AC_SUBST(NACL_SDK_VARIANT, "${nacl_cv_build_variant}") + AC_SUBST(NACL_LIB_PATH, "${nacl_cv_libpath}") AC_CHECK_TOOLS(CC, [clang gcc]) ])]) |