git.iko.soy/Idris-dev
on master help sign in
Merge pull request #2888 from enolan/gmp-flag

Refactor config.mk + bring usesGMP in sync with idris.cabal

commit9fa5aa1e5ae67b72a8fd98b7c17ac934cfc86204 authorEdwin Brady <edwin.brady@gmail.com> dateWed 20 Jan 2016, 16:06 (11 years ago) parent2f5dd79a238f45
2 files changed+5−13
compare with master
unifiedsplit
Setup.hs+1−1 config.mk+4−12
Setup.hs+1−1
@@ -53,7 +53,7 @@ usesGMP flags =
5353 case lookup (FlagName "gmp") (S.configConfigurationsFlags flags) of
5454 Just True -> True
5555 Just False -> False
56− Nothing -> True
56+ Nothing -> False
5757
5858execOnly :: S.ConfigFlags -> Bool
5959execOnly flags =
config.mk+4−12
@@ -20,28 +20,20 @@ endif
2020MACHINE := $(shell $(CC) -dumpmachine)
2121ifneq (, $(findstring darwin, $(MACHINE)))
2222 OS :=darwin
23−else
24−ifneq (, $(findstring cygwin, $(MACHINE)))
23+else ifneq (, $(findstring cygwin, $(MACHINE)))
2524 OS :=windows
26−else
27−ifneq (, $(findstring mingw, $(MACHINE)))
25+else ifneq (, $(findstring mingw, $(MACHINE)))
2826 OS :=windows
29−else
30−ifneq (, $(findstring windows, $(MACHINE)))
27+else ifneq (, $(findstring windows, $(MACHINE)))
3128 OS :=windows
3229else
3330 OS :=unix
3431endif
35−endif
36−endif
37−endif
3832
3933ifeq ($(OS),darwin)
4034 SHLIB_SUFFIX :=.dylib
41−else
42−ifeq ($(OS),windows)
35+else ifeq ($(OS),windows)
4336 SHLIB_SUFFIX :=.DLL
4437else
4538 SHLIB_SUFFIX :=.so
4639endif
47−endif