From 07c1fd553eae63aa229a1aa1b62c61714636019e Mon Sep 17 00:00:00 2001 From: sof Date: Sat, 16 Feb 2002 18:15:14 +0000 Subject: [PATCH] [project @ 2002-02-16 18:15:14 by sof] getPackageLibraries: replace some rather fragile string prefix matching code that broke when "HSstd" got renamed to "HSbase". --- ghc/compiler/main/DriverState.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs index f95dac5..16dcfcb 100644 --- a/ghc/compiler/main/DriverState.hs +++ b/ghc/compiler/main/DriverState.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverState.hs,v 1.69 2002/02/13 15:45:25 simonmar Exp $ +-- $Id: DriverState.hs,v 1.70 2002/02/16 18:15:14 sof Exp $ -- -- Settings for the driver -- @@ -508,10 +508,10 @@ getPackageLibraries = do = libs # else = if "HSbase1" `elem` libs && "HSbase2" `elem` libs - then "HSbase" : filter ((/= "HSbase").(take 5)) libs + then "HSbase" : filter (not.(isPrefixOf "HSbase")) libs else if "HSwin321" `elem` libs && "HSwin322" `elem` libs - then "HSwin32" : filter ((/= "HSwin32").(take 7)) libs + then "HSwin32" : filter (not.(isPrefixOf "HSwin32")) libs else libs # endif -- 1.7.10.4