X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=a516e6da7703e10e9979a2e56197b000ef911746;hb=acdd7c95066cf6505a4d2e8683f119146805af91;hp=e6140d234bb87a6bde69ca68c6ae66b140a73d79;hpb=d4f9480c7e7bf8167a97ff964f9d85400398c5c4;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index e6140d2..a516e6d 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -12,9 +12,7 @@ # DO NOT EDIT THIS FILE! # # - config.mk is auto-generated from config.mk.in by configure. -# This may be triggered automatically by the build system (say -# if config.mk.in has changed more recently than config.mk), -# so if you edit config.mk your changes will be spammed. +# If you edit config.mk your changes will be spammed. # # - Settings in this file may be overriden by giving replacement # definitions in build.mk. See build.mk.sample for a good @@ -28,6 +26,7 @@ TOP = @hardtop@ include $(TOP)/mk/project.mk +include $(TOP)/mk/install.mk ################################################################################ # @@ -153,7 +152,7 @@ GhcWithNativeCodeGen=$(strip\ HaveLibDL = @HaveLibDL@ # ArchSupportsSMP should be set iff there is support for that arch in -# includes/SMP.h +# includes/stg/SMP.h ArchSupportsSMP=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc powerpc))) # lazy test, because $(GhcUnregisterised) might be set in build.mk later. @@ -252,7 +251,7 @@ GhcRTSWays += debug endif ifeq "$(BuildSharedLibs)" "YES" -GhcRTSWays += dyn debug_dyn thr_dyn thr_debug_dyn +GhcRTSWays += dyn debug_dyn $(if $(findstring NO, $(GhcUnregisterised)),thr_dyn thr_debug_dyn) endif # Want the threaded versions unless we're unregisterised @@ -381,150 +380,6 @@ BIN_DIST_LIST=$(TOP)/bindist-list WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-i386-windows WINDOWS_INSTALLER = $(WINDOWS_INSTALLER_BASE)$(exeext) -# Definition of installation directories, we don't use half of these, but since -# the configure script has them on offer while passing through, we might as well -# set them. Note that we have to be careful, because the GNU coding standards -# have changed a bit over the course of time, and autoconf development reflects -# this. -# -# A little bit of history regarding autoconf and GNU coding standards, use this -# as a cheat-sheet for the stuff below: -# -# variable | default < 2.60 | default >= 2.60 -# ------------+--------------------+-------------------------------------- -# exec_prefix | ${prefix} | ${prefix} -# libdir | ${exec_prefix}/lib | ${exec_prefix}/lib -# datarootdir | NONE! | ${prefix}/share -# datadir | ${prefix}/share | ${datarootdir} -# infodir | ${prefix}/info | ${datarootdir}/info -# mandir | ${prefix}/man | ${datarootdir}/man -# docdir | NONE! | ${datarootdir}/doc/${PACKAGE_TARNAME} -# htmldir | NONE! | ${docdir} -# dvidir | NONE! | ${docdir} -# pdfdir | NONE! | ${docdir} -# psdir | NONE! | ${docdir} -# -# NOTE: The default e.g. ${docdir} above means that autoconf substitutes the -# string "${docdir}", not the value of docdir! This is crucial for the GNU -# coding standards. - -# This gets used in the default docdir when autoconf >= 2.60 is used -PACKAGE_TARNAME := @PACKAGE_TARNAME@ - -prefix := @prefix@ - -# New autoconf (>= 2.60?) make a configure with a --datarootdir=DIR flag. -# However, in order to support older autoconf's we don't use it. -# datarootdir is set lower down instead. -# But, as datadir is defined in terms of datarootdir, we also need to -# set it to the value (if any) that configure gives it here. -datarootdir := @datarootdir@ - -exec_prefix := @exec_prefix@ -bindir := @bindir@ -datadir0 := @datadir@ -libdir0 := @libdir@ -includedir := @includedir@ -mandir := @mandir@ -dynlibdir := @libdir@ - -ifeq "$(RelocatableBuild)" "YES" - -# Hack: our directory layouts tend to be different on Windows, so -# hack around configure's bogus assumptions here. -datarootdir := $(prefix) -datadir := $(prefix)/lib -libdir := $(prefix)/lib - -docdir := $(prefix)/doc -htmldir := $(docdir) -dvidir := $(docdir) -pdfdir := $(docdir) -psdir := $(docdir) - -else - -# Unix: override libdir and datadir to put ghc-specific stuff in -# a subdirectory with the version number included. -# -# datadir is set to libdir here as GHC needs package.conf and unlit -# to be in the same place (and things like ghc-pkg need to agree on -# where package.conf is, so we just set it globally). -# -datarootdir := $(datadir0) -libdir := $(libdir0)/ghc-$(ProjectVersion) -datadir := $(libdir) - -# New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags. -# However, in order to support older autoconf's we don't use them. - -#docdir := @docdir@ -#htmldir := @htmldir@ -#dvidir := @dvidir@ -#pdfdir := @pdfdir@ -#psdir := @psdir@ - -docdir := $(datarootdir)/doc/ghc -htmldir := $(docdir) -dvidir := $(docdir) -pdfdir := $(docdir) -psdir := $(docdir) - -endif # Windows - -headerdir := $(libdir)/include - -# Default place for putting interface files is $(libdir) -# (overriden for packages in package.mk) -ifacedir = $(libdir) - -# NOTE: by intention, libexecdir and libdir point to -# the same place. -# => Only way to override this is to set libexecdir= on the command line. -# (NOTE: configure script setting is ignored). -libexecdir = $(libdir) - -#----------------------------------------------------------------------------- -# install configuration - -# -# Set this to have files installed with a specific owner -# -INSTALL_OWNER = - -# -# Set this to have files installed with a specific group -# -INSTALL_GROUP = - -# -# Invocations of `install' for the four different classes -# of targets: -# -CREATE_SCRIPT = create () { touch $$1 && chmod 755 $$1 ; } && create -CREATE_DATA = create () { touch $$1 && chmod 644 $$1 ; } && create -INSTALL_PROGRAM = $(INSTALL) -m 755 -INSTALL_SCRIPT = $(INSTALL) -m 755 -INSTALL_SHLIB = $(INSTALL) -m 755 -INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_HEADER = $(INSTALL) -m 644 -INSTALL_MAN = $(INSTALL) -m 644 -INSTALL_DOC = $(INSTALL) -m 644 -INSTALL_DIR = $(INSTALL) -m 755 -d - -# -# runhaskell and hsc2hs are special, in that other compilers besides -# GHC might provide them. Systems with a package manager often come -# with tools to manage this kind of clash, e.g. RPM's -# update-alternatives. When building a distribution for such a system, -# we recommend setting both of the following to 'YES'. -# -# NO_INSTALL_RUNHASKELL = YES -# NO_INSTALL_HSC2HS = YES -# -# NB. we use negative tests here because for binary-distributions we cannot -# test build-time variables at install-time, so they must default to on. - # ----------------------------------------------------------------------------- # Utilities programs: flags @@ -682,6 +537,7 @@ HaveGcc = @HaveGcc@ UseGcc = YES WhatGccIsCalled = @WhatGccIsCalled@ GccVersion = @GccVersion@ +GccLT34 = @GccLT34@ ifeq "$(strip $(HaveGcc))" "YES" ifneq "$(strip $(UseGcc))" "YES" CC = cc @@ -997,7 +853,6 @@ 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 @@ -1091,6 +946,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 # ################################################################################