From 15552e1454cef69c118777720531213256e91079 Mon Sep 17 00:00:00 2001 From: sof Date: Wed, 23 Mar 2005 18:51:34 +0000 Subject: [PATCH] [project @ 2005-03-23 18:51:33 by sof] Rename the filenames used for the 'win32' package to {lib}HSwin_32{1.o,2.o,.a} so as to avoid conflicts with the 'Win32' package when installing to a common library directory on a case-insensitive filesystem (as we do when building binary dists under Windows.) This fixes the off-the-bat brokenness experienced by people trying to load the 'Win32' package with ghci-6.4. Note: package creators may want to make a note of this if they haven't already, i.e., while the package infrastructure is case-sensitive, it's unsafe to assume that the underlying filesystem is. Merge to STABLE. --- ghc/compiler/main/Packages.lhs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/main/Packages.lhs b/ghc/compiler/main/Packages.lhs index 06180a1..3f581e2 100644 --- a/ghc/compiler/main/Packages.lhs +++ b/ghc/compiler/main/Packages.lhs @@ -466,6 +466,9 @@ getPackageLinkOpts dflags pkgs = do -- THIS IS A STRICTLY TEMPORARY HACK (famous last words ...) -- JRS 04 Sept 01: Same appalling hack for HSwin32[1,2] -- KAA 29 Mar 02: Same appalling hack for HSobjectio[1,2,3,4] + -- + -- [sof 03/05: Renamed the (moribund) HSwin32 to HSwin_32 so as to + -- avoid filename conflicts with the 'Win32' package on a case-insensitive filesystem] hACK libs # if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS) = libs @@ -473,8 +476,8 @@ getPackageLinkOpts dflags pkgs = do = if "HSbase1" `elem` libs && "HSbase2" `elem` libs && "HSbase3" `elem` libs then "HSbase" : filter (not.(isPrefixOf "HSbase")) libs else - if "HSwin321" `elem` libs && "HSwin322" `elem` libs - then "HSwin32" : filter (not.(isPrefixOf "HSwin32")) libs + if "HSwin_321" `elem` libs && "HSwin_322" `elem` libs + then "HSwin_32" : filter (not.(isPrefixOf "HSwin_32")) libs else if "HSobjectio1" `elem` libs && "HSobjectio2" `elem` libs && "HSobjectio3" `elem` libs && "HSobjectio4" `elem` libs then "HSobjectio" : filter (not.(isPrefixOf "HSobjectio")) libs -- 1.7.10.4