From b36060cc200dcad38693479ebfd074c353fc85d5 Mon Sep 17 00:00:00 2001 From: whitequark Date: Fri, 1 May 2020 23:57:35 +0000 Subject: [PATCH 1/2] Fix WASI builds with abc enabled. This PR works around #2011. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 47de420b8..1f8ffdc47 100644 --- a/Makefile +++ b/Makefile @@ -281,13 +281,13 @@ yosys.html: misc/yosys.html else ifeq ($(CONFIG),wasi) ifeq ($(WASI_SDK),) -CXX = clang++ +CXX = clang LD = clang++ AR = llvm-ar RANLIB = llvm-ranlib WASIFLAGS := -target wasm32-wasi --sysroot $(WASI_SYSROOT) $(WASIFLAGS) else -CXX = $(WASI_SDK)/bin/clang++ +CXX = $(WASI_SDK)/bin/clang LD = $(WASI_SDK)/bin/clang++ AR = $(WASI_SDK)/bin/ar RANLIB = $(WASI_SDK)/bin/ranlib From ff7a8d0e1e1e6fab3e508bb8c237502ef570132b Mon Sep 17 00:00:00 2001 From: whitequark Date: Sat, 2 May 2020 00:18:33 +0000 Subject: [PATCH 2/2] Update ABC to include WASI support fixes. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1f8ffdc47..838d29788 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ bumpversion: # is just a symlink to your actual ABC working directory, as 'make mrproper' # will remove the 'abc' directory and you do not want to accidentally # delete your work on ABC.. -ABCREV = d14acd8 +ABCREV = fd2c9b1 ABCPULL = 1 ABCURL ?= https://github.com/YosysHQ/abc ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1