X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=a489fbf598001b0011d32f1f175d86fa282826a1;hb=758049f2942a8a22a6b2c86d0c756c6b8f371e02;hp=3718485bee47d225411124dbab2a784d6921ce07;hpb=8b08c15b8ace5a76e341939081fbb6ad2736ddd1;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 3718485..a489fbf 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -341,6 +341,8 @@ endif # debug_u : debugging unregisterised # thr_debug : debugging threaded # thr_debug_p : debugging threaded profiled +# t : ticky-ticky profiling +# debug_t : debugging ticky-ticky profiling # ifeq "$(BootingFromHc)" "YES" GhcRTSWays= @@ -508,6 +510,7 @@ FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@ # passing through, we might as well set them. prefix = @prefix@ +datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ bindir = @bindir@ datadir0 = @datadir@ @@ -832,11 +835,11 @@ GhcMajVersion = @GhcMajVersion@ GhcMinVersion = @GhcMinVersion@ # Some useful GHC version predicates: -ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi) -ghc_ge_601 = $(shell if (test $(GhcCanonVersion) -ge 601); then echo YES; else echo NO; fi) -ghc_ge_602 = $(shell if (test $(GhcCanonVersion) -ge 602); then echo YES; else echo NO; fi) -ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi) -ghc_ge_605 = $(shell if (test $(GhcCanonVersion) -ge 605); then echo YES; else echo NO; fi) +ghc_ge_504 = @ghc_ge_504@ +ghc_ge_601 = @ghc_ge_601@ +ghc_ge_602 = @ghc_ge_602@ +ghc_ge_603 = @ghc_ge_603@ +ghc_ge_605 = @ghc_ge_605@ endif # Canonicalised ghc version number, used for easy (integer) version @@ -881,6 +884,9 @@ endif HaveLibGmp = @HaveLibGmp@ LibGmp = @LibGmp@ +GMP_INCLUDE_DIRS=@GMP_INCLUDE_DIRS@ +GMP_LIB_DIRS=@GMP_LIB_DIRS@ + #----------------------------------------------------------------------------- # GMP framework (Mac OS X) #