From afd46429fcdb83aa9fa7c193ede40bff3f3ff151 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Wed, 19 Jan 2022 15:14:02 +0900 Subject: tool/m4/ruby_wasm_tools.m4: force passing WASI_SDK_PATH when building for wasi Make the WASI_SDK_PATH variable mandatory when building for wasi host. This requirement prevents developers from being stuck due to unfriendly configuration's error message. --- tool/m4/ruby_wasm_tools.m4 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tool') diff --git a/tool/m4/ruby_wasm_tools.m4 b/tool/m4/ruby_wasm_tools.m4 index d58de88ec8..a6d8c34ebc 100644 --- a/tool/m4/ruby_wasm_tools.m4 +++ b/tool/m4/ruby_wasm_tools.m4 @@ -10,12 +10,15 @@ AC_DEFUN([RUBY_WASM_TOOLS], : ${wasmoptflags=-O3} AC_MSG_CHECKING([wheather \$WASI_SDK_PATH is set]) - AS_IF([test x"${WASI_SDK_PATH}" = x], [AC_MSG_RESULT([no])], [ + AS_IF([test x"${WASI_SDK_PATH}" = x], [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([WASI_SDK_PATH environment variable is required]) + ], [ AC_MSG_RESULT([yes]) - CC="${WASI_SDK_PATH}/bin/clang" - LD="${WASI_SDK_PATH}/bin/clang" - AR="${WASI_SDK_PATH}/bin/llvm-ar" - RANLIB="${WASI_SDK_PATH}/bin/llvm-ranlib" + CC="${CC:-${WASI_SDK_PATH}/bin/clang}" + LD="${LD:-${WASI_SDK_PATH}/bin/clang}" + AR="${AR:-${WASI_SDK_PATH}/bin/llvm-ar}" + RANLIB="${RANLIB:-${WASI_SDK_PATH}/bin/llvm-ranlib}" ]) ]) ])dnl -- cgit v1.2.3