on master help sign in
Define IDRIS_GMP if compiling with real GMP

Only add minigmp to the rts if needed. Remove obsolete hack. Fixes #4470

commitc889dc94336402acc60d22cafe6109067e0e759d authorNiklas Larsson <niklas@mm.st> dateSat 9 Jun 2018, 10:47 (8 years ago) parent3a2f57e
2 files changed+8−12
rts/Makefile+7−11 src/IRTS/System.hs+1−1
rts/Makefile+7−11
@@ -1,30 +1,26 @@
11include ../config.mk
22
33OBJS = idris_rts.o idris_heap.o idris_gc.o idris_gmp.o idris_bitstring.o \
4− idris_opts.o idris_stats.o idris_utf8.o idris_stdfgn.o mini-gmp.o \
4+ idris_opts.o idris_stats.o idris_utf8.o idris_stdfgn.o \
55 idris_buffer.o getline.o idris_net.o
66HDRS = idris_rts.h idris_heap.h idris_gc.h idris_gmp.h idris_bitstring.h \
7− idris_opts.h idris_stats.h mini-gmp.h idris_stdfgn.h idris_net.h \
7+ idris_opts.h idris_stats.h idris_stdfgn.h idris_net.h \
88 idris_buffer.h idris_utf8.h getline.h
99CFLAGS := $(CFLAGS)
1010CFLAGS += $(GMP_INCLUDE_DIR) $(GMP) -DIDRIS_TARGET_OS="\"$(OS)\""
1111CFLAGS += -DIDRIS_TARGET_TRIPLE="\"$(MACHINE)\""
1212
13−# NOTE: This works around glibc 2.11 not declaring pthread_mutexattr_settype
14−# and PTHREAD_MUTEX_RECURSIVE by default, causing compilation failures on
15−# Debian 6 and Ubuntu 10.04 LTS.
16−ifeq ($(OS), unix)
17−ifneq ($(shell ldd --version | head -n 1 | grep 2.11),)
18− CFLAGS += -D_GNU_SOURCE
19−endif
20−endif
21−
2213ifeq ($(OS), windows)
2314 OBJS += windows/win_utils.o
2415else
2516 CFLAGS += -fPIC
2617endif
2718
19+ifndef IDRIS_GMP
20+ OBJS += mini-gmp.o
21+ HDRS += mini-gmp.h
22+endif
23+
2824LIBTARGET = libidris_rts.a
2925
3026build: $(LIBTARGET) $(DYLIBTARGET)
src/IRTS/System.hs+1−1
@@ -83,7 +83,7 @@ extraInclude = []
8383#endif
8484
8585#ifdef IDRIS_GMP
86−gmpLib = ["-lgmp"]
86+gmpLib = ["-lgmp", "-DIDRIS_GMP"]
8787#else
8888gmpLib = []
8989#endif