diff options
| author | whitequark <whitequark@whitequark.org> | 2020-05-05 14:03:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 14:03:40 +0000 |
| commit | ae409d4d81f3a15aba58d5144e68b565cf70b79a (patch) | |
| tree | 68ed00efe9210f0a13cf02aa96d19cabc5acdf76 | |
| parent | 5fa06e4894f13d82cf847f8d7b078c5b46a01737 (diff) | |
| parent | ff7a8d0e1e1e6fab3e508bb8c237502ef570132b (diff) | |
| download | yosys-ae409d4d81f3a15aba58d5144e68b565cf70b79a.tar.gz yosys-ae409d4d81f3a15aba58d5144e68b565cf70b79a.tar.bz2 yosys-ae409d4d81f3a15aba58d5144e68b565cf70b79a.zip | |
Merge pull request #2012 from whitequark/fix-wasi-abc-build
Fix WASI builds with abc enabled
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 @@ -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 |