From efa09201c9fb6c400caff94a70295d268bc31fcb Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Mon, 30 Nov 2020 17:19:20 -0800 Subject: [PATCH] Also set CMAKE_AR. It appears with the removal of the AR checks cmake is no longer autodetecting CMAKE_AR, so set it explicitly. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index cc3779c..fcf8ab8 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ build/compiler-rt.BUILT: build/llvm.BUILT cd build/compiler-rt && cmake -G Ninja \ -DCMAKE_C_COMPILER_WORKS=ON \ -DCMAKE_CXX_COMPILER_WORKS=ON \ + -DCMAKE_AR=$(BUILD_PREFIX)/bin/ar \ -DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_TOOLCHAIN_FILE=$(ROOT_DIR)/wasi-sdk.cmake \ @@ -122,6 +123,7 @@ build/compiler-rt.BUILT: build/llvm.BUILT LIBCXX_CMAKE_FLAGS = \ -DCMAKE_C_COMPILER_WORKS=ON \ -DCMAKE_CXX_COMPILER_WORKS=ON \ + -DCMAKE_AR=$(BUILD_PREFIX)/bin/ar \ -DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \ -DCMAKE_TOOLCHAIN_FILE=$(ROOT_DIR)/wasi-sdk.cmake \ -DCMAKE_STAGING_PREFIX=$(PREFIX)/share/wasi-sysroot \ @@ -161,6 +163,7 @@ build/libcxx.BUILT: build/llvm.BUILT build/compiler-rt.BUILT build/wasi-libc.BUI LIBCXXABI_CMAKE_FLAGS = \ -DCMAKE_C_COMPILER_WORKS=ON \ -DCMAKE_CXX_COMPILER_WORKS=ON \ + -DCMAKE_AR=$(BUILD_PREFIX)/bin/ar \ -DCMAKE_MODULE_PATH=$(ROOT_DIR)/cmake \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF \