git.iko.soy/Idris-dev
on master help sign in
Merge pull request #2888 from enolan/gmp-flag
9fa5aa1Edwin Brady
Setup.hs+1−1
compare with master
unifiedsplit
@@ -53,7 +53,7 @@ usesGMP flags =
53 case lookup (FlagName "gmp") (S.configConfigurationsFlags flags) of
53 case lookup (FlagName "gmp") (S.configConfigurationsFlags flags) of
54 Just True -> True
54 Just True -> True
55 Just False -> False
55 Just False -> False
56− Nothing -> True
56+ Nothing -> False
57
57
58execOnly :: S.ConfigFlags -> Bool
58execOnly :: S.ConfigFlags -> Bool
59execOnly flags =
59execOnly flags =
config.mk+4−12
@@ -20,28 +20,20 @@ endif
20MACHINE := $(shell $(CC) -dumpmachine)
20MACHINE := $(shell $(CC) -dumpmachine)
21ifneq (, $(findstring darwin, $(MACHINE)))
21ifneq (, $(findstring darwin, $(MACHINE)))
22 OS :=darwin
22 OS :=darwin
23−else
24−ifneq (, $(findstring cygwin, $(MACHINE)))
23+else ifneq (, $(findstring cygwin, $(MACHINE)))
25 OS :=windows
24 OS :=windows
26−else
27−ifneq (, $(findstring mingw, $(MACHINE)))
25+else ifneq (, $(findstring mingw, $(MACHINE)))
28 OS :=windows
26 OS :=windows
29−else
30−ifneq (, $(findstring windows, $(MACHINE)))
27+else ifneq (, $(findstring windows, $(MACHINE)))
31 OS :=windows
28 OS :=windows
32else
29else
33 OS :=unix
30 OS :=unix
34endif
31endif
35−endif
36−endif
37−endif
38
32
39ifeq ($(OS),darwin)
33ifeq ($(OS),darwin)
40 SHLIB_SUFFIX :=.dylib
34 SHLIB_SUFFIX :=.dylib
41−else
42−ifeq ($(OS),windows)
35+else ifeq ($(OS),windows)
43 SHLIB_SUFFIX :=.DLL
36 SHLIB_SUFFIX :=.DLL
44else
37else
45 SHLIB_SUFFIX :=.so
38 SHLIB_SUFFIX :=.so
46endif
39endif
47−endif