brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix emar and emranlib usage for wasm builds

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-08-03 15:08:46 +01:00
parent dc1cc5d044
commit 4f3fdd239e
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
deps/Makefile vendored
View file

@ -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'

2
deps/PawPaw vendored

@ -1 +1 @@
Subproject commit 3960c15767a65f20e6e541958bec8ae250bc7f71
Subproject commit 7ef509e689656fc4cd5be814a32f54dac37af931