From 0e242caefac14dad01e3f41e1b58a5f138054988 Mon Sep 17 00:00:00 2001 From: ijones <ijones@syntaxpolice.org> Date: Tue, 9 Aug 2005 01:26:18 +0000 Subject: [PATCH] from ross buildGHC: reset search path before adding hs-source-dirs, so that these are the only directories GHC searches. --- Distribution/Simple/Build.hs | 1 + package.conf.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Distribution/Simple/Build.hs b/Distribution/Simple/Build.hs index 4c4fd04429..1026016c0b 100644 --- a/Distribution/Simple/Build.hs +++ b/Distribution/Simple/Build.hs @@ -281,6 +281,7 @@ constructGHCCmdLine comp srcLocs bi deps = then ["-hide-all-packages"] else []) ++ ["--make"] + ++ ["-i"] ++ ["-i" ++ l | l <- nub (hsSourceDirs bi ++ srcLocs)] ++ [ "-#include \"" ++ inc ++ "\"" | inc <- includes bi ] ++ nub (flags ++ hcOptions GHC (options bi)) diff --git a/package.conf.in b/package.conf.in index 916addbf4f..d6f3c1d83a 100644 --- a/package.conf.in +++ b/package.conf.in @@ -43,7 +43,7 @@ library-dirs: LIB_DIR hs-libraries: "HSCabal" extra-libraries: #if defined(mingw32_HOST_OS) || defined(__MINGW32__) || defined(_MSC_VER) - "shell32" + "shfolder" #endif include-dirs: -- GitLab