From ab3a88f2dc64677df8fb92dacef47570ac3c5023 Mon Sep 17 00:00:00 2001 From: simonpj Date: Fri, 12 Nov 2004 13:28:58 +0000 Subject: [PATCH] [project @ 2004-11-12 13:28:35 by simonpj] build fix for Windows --- ghc/compiler/Makefile | 5 +++++ ghc/utils/ghc-pkg/Makefile | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index efdba2d..12e50eb 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -513,6 +513,11 @@ ifeq "$(stage)" "1" SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR) SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat +ifeq "$(Windows)" "YES" +# not very nice, but required for -lghccompat on Windows +SRC_LD_OPTS += -lshell32 +endif + # This is horrible. We ought to be able to omit the entire directory # from mkDependHS. SRC_MKDEPENDHS_OPTS += \ diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile index 833173a..d4b3d14 100644 --- a/ghc/utils/ghc-pkg/Makefile +++ b/ghc/utils/ghc-pkg/Makefile @@ -16,6 +16,11 @@ SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR) SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat +ifeq "$(Windows)" "YES" +# not very nice, but required for -lghccompat on Windows +SRC_LD_OPTS += -lshell32 +endif + ifeq "$(ghc_ge_504)" "NO" SRC_HC_OPTS += -package lang -package util -package text endif -- 1.7.10.4