aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMiodrag Milanovic <mmicko@gmail.com>2018-08-18 18:21:28 +0200
committerMiodrag Milanovic <mmicko@gmail.com>2018-08-18 18:21:28 +0200
commit443865ab870248aed91700686160d36ed616503d (patch)
tree7dd83d4ccbdfba1e7584e31906cc847730a6b6ca /Makefile
parent45740236b6b0aa8d445fb3fea8d8c1ec497be3cf (diff)
downloadyosys-443865ab870248aed91700686160d36ed616503d.tar.gz
yosys-443865ab870248aed91700686160d36ed616503d.tar.bz2
yosys-443865ab870248aed91700686160d36ed616503d.zip
respect DISABLE_ABC_THREADS if used
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 024b216f0..c3e3a4b47 100644
--- a/Makefile
+++ b/Makefile
@@ -159,13 +159,16 @@ ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"
else ifeq ($(CONFIG),gcc-static)
LD = $(CXX)
LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s
-LDLIBS := -static $(filter-out -lrt,$(LDLIBS))
+LDLIBS := -static $(filter-out -lrt,$(LDLIBS))
ifeq ($(NO_FPIC),1)
CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
endif
CXXFLAGS += -std=c++11 -Os
-ABCMKARGS = CC="$(CC)" CXX="$(CXX)" LD="$(LD)" ABC_USE_LIBSTDCXX=1 LIBS="-static -lm -lpthread" OPTFLAGS="-O" \
+ABCMKARGS = CC="$(CC)" CXX="$(CXX)" LD="$(LD)" ABC_USE_LIBSTDCXX=1 LIBS="-lm -lpthread -static" OPTFLAGS="-O" \
ARCHFLAGS="-DABC_USE_STDINT_H -DABC_NO_DYNAMIC_LINKING=1 -Wno-unused-but-set-variable $(ARCHFLAGS)" ABC_USE_NO_READLINE=1
+ifeq ($(DISABLE_ABC_THREADS),1)
+ABCMKARGS += "ABC_USE_NO_PTHREADS=1"
+endif
else ifeq ($(CONFIG),gcc-4.8)
CXX = gcc-4.8