´Use g++ and clang++ instead of gcc and clang as C++ compilers

This commit is contained in:
Roland Coeurjoly 2024-02-23 14:03:12 +01:00
parent 84116c9a38
commit fe34abab3a
1 changed files with 7 additions and 7 deletions

View File

@ -215,7 +215,7 @@ ABC_ARCHFLAGS += "-DABC_NO_RLIMIT"
endif endif
ifeq ($(CONFIG),clang) ifeq ($(CONFIG),clang)
CXX = clang CXX = clang++
LD = clang++ LD = clang++
CXXFLAGS += -std=$(CXXSTD) -Os CXXFLAGS += -std=$(CXXSTD) -Os
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing $(ABC_ARCHFLAGS)" ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing $(ABC_ARCHFLAGS)"
@ -238,8 +238,8 @@ endif
endif endif
else ifeq ($(CONFIG),gcc) else ifeq ($(CONFIG),gcc)
CXX = gcc CXX = g++
LD = gcc LD = g++
CXXFLAGS += -std=$(CXXSTD) -Os CXXFLAGS += -std=$(CXXSTD) -Os
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H $(ABC_ARCHFLAGS)" ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H $(ABC_ARCHFLAGS)"
@ -262,8 +262,8 @@ CXXFLAGS += -std=$(CXXSTD) -Os
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H" ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"
else ifeq ($(CONFIG),cygwin) else ifeq ($(CONFIG),cygwin)
CXX = gcc CXX = g++
LD = gcc LD = g++
CXXFLAGS += -std=gnu++11 -Os CXXFLAGS += -std=gnu++11 -Os
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H" ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"
@ -309,13 +309,13 @@ yosys.html: misc/yosys.html
else ifeq ($(CONFIG),wasi) else ifeq ($(CONFIG),wasi)
ifeq ($(WASI_SDK),) ifeq ($(WASI_SDK),)
CXX = clang CXX = clang++
LD = clang++ LD = clang++
AR = llvm-ar AR = llvm-ar
RANLIB = llvm-ranlib RANLIB = llvm-ranlib
WASIFLAGS := -target wasm32-wasi --sysroot $(WASI_SYSROOT) $(WASIFLAGS) WASIFLAGS := -target wasm32-wasi --sysroot $(WASI_SYSROOT) $(WASIFLAGS)
else else
CXX = $(WASI_SDK)/bin/clang CXX = $(WASI_SDK)/bin/clang++
LD = $(WASI_SDK)/bin/clang++ LD = $(WASI_SDK)/bin/clang++
AR = $(WASI_SDK)/bin/ar AR = $(WASI_SDK)/bin/ar
RANLIB = $(WASI_SDK)/bin/ranlib RANLIB = $(WASI_SDK)/bin/ranlib