X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ba5406ba7799ee728413ec059e20f39c20ab1390;hb=b5f2a027f2b951fc0fba2c9bd62bb7d13898030c;hp=f11c6f783010f1531973c27795fecfcfd0db3960;hpb=9d8add68a1e971cffaca03b22692080951041f7c;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index f11c6f7..ba5406b 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -35,12 +35,9 @@ include $(TOP)/mk/install.mk ################################################################################ # BootingFromHc - build GHC and the libraries from .hc files? +# (unregisterised only) BootingFromHc = @BootingFromHc@ -# BootingFromUnregisterisedHc - treat .hc files as containing unregisterised -# rather than registerised code, i.e., disable the mangler? -BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@ - NO_INCLUDE_DEPS = NO NO_INCLUDE_PKGDATA = NO @@ -241,7 +238,6 @@ endif # debug_t : debugging ticky-ticky profiling # l : event logging # thr_l : threaded and event logging -# thr_debug_l : threaded and debugging and event logging # GhcRTSWays=l @@ -537,6 +533,7 @@ HaveGcc = @HaveGcc@ UseGcc = YES WhatGccIsCalled = @WhatGccIsCalled@ GccVersion = @GccVersion@ +GccLT34 = @GccLT34@ ifeq "$(strip $(HaveGcc))" "YES" ifneq "$(strip $(UseGcc))" "YES" CC = cc @@ -774,8 +771,7 @@ endif # # The ways currently defined. # -ALL_WAYS=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr_p thr_debug thr_debug_l debug_p thr_debug_p -USER_WAYS=a b c d e f g h j k l m n o A B +ALL_WAYS=v p t l s mp mg debug dyn thr thr_l debug_dyn thr_dyn thr_debug_dyn thr_p thr_debug debug_p thr_debug_p # # The following ways currently have treated specially, p t mg, @@ -845,14 +841,9 @@ WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG WAY_thr_debug_p_NAME=threaded debug profiling WAY_thr_debug_p_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -prof -# Way 'thr_debug_l': -WAY_thr_debug_l_NAME=threaded debug event logging -WAY_thr_debug_l_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -eventlog - # Way 'dyn': build dynamic shared libraries WAY_dyn_NAME=dyn WAY_dyn_HC_OPTS=-fPIC -dynamic -WAY_dyn_LIB_TARGET=libHSrts-gcc661.so # Way 'thr_dyn': WAY_thr_dyn_NAME=thr_dyn @@ -866,57 +857,6 @@ WAY_thr_debug_dyn_HC_OPTS=-fPIC -dynamic -optc-DTHREADED_RTS -optc-DDEBUG WAY_debug_dyn_NAME=thr_dyn WAY_debug_dyn_HC_OPTS=-fPIC -dynamic -optc-DDEBUG -# -# Add user-way configurations here: -# -WAY_A_NAME= -WAY_A_HC_OPTS= - -WAY_B_NAME= -WAY_B_HC_OPTS= - -WAY_a_NAME= -WAY_a_HC_OPTS= - -WAY_b_NAME= -WAY_b_HC_OPTS= - -WAY_c_NAME= -WAY_c_HC_OPTS= - -WAY_d_NAME= -WAY_d_HC_OPTS= - -WAY_e_NAME= -WAY_e_HC_OPTS= - -WAY_f_NAME= -WAY_f_HC_OPTS= - -WAY_g_NAME= -WAY_g_HC_OPTS= - -WAY_h_NAME= -WAY_h_HC_OPTS= - -WAY_j_NAME= -WAY_j_HC_OPTS= - -WAY_k_NAME= -WAY_k_HC_OPTS= - -WAY_l_NAME= -WAY_l_HC_OPTS= - -WAY_m_NAME= -WAY_m_HC_OPTS= - -WAY_n_NAME= -WAY_n_HC_OPTS= - -WAY_o_NAME= -WAY_o_HC_OPTS= - ################################################################################ # # 31-bit-Int Core files @@ -946,6 +886,15 @@ CONFIGURE_ARGS = @CONFIGURE_ARGS@ ################################################################################ # +# To be passed to sub-builds +# +################################################################################ + +ICONV_INCLUDE_DIRS = @ICONV_INCLUDE_DIRS@ +ICONV_LIB_DIRS = @ICONV_LIB_DIRS@ + +################################################################################ +# # Bindist testing directory # ################################################################################