X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ea3c1ffdbea442e5c70a6f3d68ded3c2fc87cfc0;hp=36dd2d3fd78b59b44ba4628217783dc8d2f6e754;hb=0af418beb1aadcae1df036240151556895d00321;hpb=a35d65c3465de9661325a9295715b1ef298eb888 diff --git a/mk/config.mk.in b/mk/config.mk.in index 36dd2d3..ea3c1ff 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -102,7 +102,7 @@ GhcDebugged=NO GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO) # Do we support shared libs? -PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux),YES,NO) +PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd amd64-unknown-freebsd),YES,NO) # ToDo later: # BuildStaticLibs=@BuildStaticLibs@ @@ -302,9 +302,6 @@ SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\ # By default, enable SplitObjs for the libraries if this build supports it SplitObjs=$(SupportsSplitObjs) -# Math library -LIBM=@LIBM@ - # .NET interop support? # DotnetSupport=NO @@ -409,7 +406,6 @@ GHC_GENPRIMOP_PGM = genprimopcode$(exeext) GHC_GENAPPLY_PGM = genapply$(exeext) GHC_CABAL_PGM = ghc-cabal$(exeext) GHC_PKG_PGM = ghc-pkg$(exeext) -GHC_MKDEPENDC_PGM = mkdependC GHC_LTX_PGM = ltx$(exeext) GHC_MKDIRHIER_PGM = mkdirhier GHC_LNDIR_PGM = lndir @@ -433,7 +429,6 @@ LNDIR = $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM) UNLIT = $(INPLACE_LIB)/$(GHC_UNLIT_PGM) TOUCHY = $(INPLACE_LIB)/$(GHC_TOUCHY_PGM) MKDIRHIER = $(INPLACE_BIN)/$(GHC_MKDIRHIER_PGM) -MKDEPENDC = $(INPLACE_BIN)/$(GHC_MKDEPENDC_PGM) GHC_CABAL_INPLACE = $(INPLACE_BIN)/$(GHC_CABAL_PGM) GENAPPLY_INPLACE = $(INPLACE_BIN)/$(GHC_GENAPPLY_PGM) GHC_PKG_INPLACE = $(INPLACE_BIN)/$(GHC_PKG_PGM) @@ -550,6 +545,7 @@ SRC_HSC2HS_OPTS += $(foreach d,$(GMP_INCLUDE_DIRS),-I$(d)) # Mingwex Library # HaveLibMingwEx = @HaveLibMingwEx@ +DLLTOOL = inplace/mingw/bin/dlltool.exe #----------------------------------------------------------------------------- # Flex (currently unused, could be moved to glafp-utils) @@ -570,6 +566,8 @@ BASH = /usr/local/bin/bash CONTEXT_DIFF = @ContextDiffCmd@ CP = cp +# It's not easy to separate the CPP program from its flags, as +# AC_PROG_CPP defines CPP as "/usr/bin/gcc -E" CPP = @CPP@ @CPPFLAGS@ CTAGS = $(ETAGS) # @@ -600,8 +598,12 @@ PIC = pic PREPROCESSCMD = $(CC) -E RANLIB = @RANLIB@ SED = @SedCmd@ +TR = tr SHELL = /bin/sh +HaveDtrace = @HaveDtrace@ +DTRACE = @DtraceCmd@ + LD = @LdCmd@ NM = @NmCmd@