aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2018-02-19 19:32:11 +0100
committerGitHub <noreply@github.com>2018-02-19 19:32:11 +0100
commitf2cfe73d74a5be195ee704c99f472dc454015a66 (patch)
tree8e9b93c7837752bc2039ab3f942f729710a8d269
parent5c6247dfa6a5a0b8f1dfbec2810db54deb42deb3 (diff)
parentb0b08da5cbd55f0df4961e340f530118c5a3f041 (diff)
downloadyosys-f2cfe73d74a5be195ee704c99f472dc454015a66.tar.gz
yosys-f2cfe73d74a5be195ee704c99f472dc454015a66.tar.bz2
yosys-f2cfe73d74a5be195ee704c99f472dc454015a66.zip
Merge pull request #507 from cr1901/msys2
Improve msys2 flags for building abc.
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b8ffc2ad5..546de91e1 100644
--- a/Makefile
+++ b/Makefile
@@ -196,14 +196,14 @@ ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=1 CC="$(CXX)"
EXE = .exe
else ifeq ($(CONFIG),msys2)
-CXX = i686-w64-mingw32-gcc
-LD = i686-w64-mingw32-gcc
+CXX = i686-w64-mingw32-g++
+LD = i686-w64-mingw32-g++
CXXFLAGS += -std=c++11 -Os -D_POSIX_SOURCE -DYOSYS_WIN32_UNIX_DIR
CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s
LDLIBS := $(filter-out -lrt,$(LDLIBS))
ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC -fpermissive -w"
-ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=0 CC="$(CXX)" CXX="$(CXX)"
+ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=0 CC="i686-w64-mingw32-gcc" CXX="$(CXX)"
EXE = .exe
else ifneq ($(CONFIG),none)