From 4f3fdd239e314352ec1f2fd502d9290b258ae35e Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 3 Aug 2022 15:08:46 +0100 Subject: [PATCH] fix emar and emranlib usage for wasm builds Signed-off-by: falkTX --- deps/Makefile | 12 ++++++++++++ deps/PawPaw | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/deps/Makefile b/deps/Makefile index 4c9b83f..c82a263 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -134,6 +134,18 @@ endif CMAKE += -DCMAKE_OSX_SYSROOT=$(shell xcrun --sdk macosx --show-sdk-path) endif +# fix emar and emranlib usage +ifeq ($(WASM),true) +CMAKE_AR = $(shell which $(AR)) +CMAKE_RANLIB = $(shell which $(RANLIB)) +CMAKE += -DCMAKE_AR=$(CMAKE_AR) +CMAKE += -DCMAKE_C_COMPILER_AR=$(CMAKE_AR) +CMAKE += -DCMAKE_CXX_COMPILER_AR=$(CMAKE_AR) +CMAKE += -DCMAKE_RANLIB=$(CMAKE_RANLIB) +CMAKE += -DCMAKE_C_COMPILER_RANLIB=$(CMAKE_RANLIB) +CMAKE += -DCMAKE_CXX_COMPILER_RANLIB=$(CMAKE_RANLIB) +endif + # fix cross-compilation for windows ifeq ($(WINDOWS),true) CMAKE += -G 'Unix Makefiles' diff --git a/deps/PawPaw b/deps/PawPaw index 3960c15..7ef509e 160000 --- a/deps/PawPaw +++ b/deps/PawPaw @@ -1 +1 @@ -Subproject commit 3960c15767a65f20e6e541958bec8ae250bc7f71 +Subproject commit 7ef509e689656fc4cd5be814a32f54dac37af931