Skip to content
Snippets Groups Projects
Commit 0e242cae authored by Isaac Potoczny-Jones's avatar Isaac Potoczny-Jones
Browse files

from ross

  buildGHC: reset search path before adding hs-source-dirs, so that these
  are the only directories GHC searches.
parent 8ad58234
No related branches found
No related tags found
No related merge requests found
...@@ -281,6 +281,7 @@ constructGHCCmdLine comp srcLocs bi deps = ...@@ -281,6 +281,7 @@ constructGHCCmdLine comp srcLocs bi deps =
then ["-hide-all-packages"] then ["-hide-all-packages"]
else []) else [])
++ ["--make"] ++ ["--make"]
++ ["-i"]
++ ["-i" ++ l | l <- nub (hsSourceDirs bi ++ srcLocs)] ++ ["-i" ++ l | l <- nub (hsSourceDirs bi ++ srcLocs)]
++ [ "-#include \"" ++ inc ++ "\"" | inc <- includes bi ] ++ [ "-#include \"" ++ inc ++ "\"" | inc <- includes bi ]
++ nub (flags ++ hcOptions GHC (options bi)) ++ nub (flags ++ hcOptions GHC (options bi))
......
...@@ -43,7 +43,7 @@ library-dirs: LIB_DIR ...@@ -43,7 +43,7 @@ library-dirs: LIB_DIR
hs-libraries: "HSCabal" hs-libraries: "HSCabal"
extra-libraries: extra-libraries:
#if defined(mingw32_HOST_OS) || defined(__MINGW32__) || defined(_MSC_VER) #if defined(mingw32_HOST_OS) || defined(__MINGW32__) || defined(_MSC_VER)
"shell32" "shfolder"
#endif #endif
include-dirs: include-dirs:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment