From 30d296f9e4426fdde48553c653e496e4a6cafaeb Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 24 Mar 2004 10:50:35 +0000 Subject: [PATCH] [project @ 2004-03-24 10:50:34 by simonmar] -i on its own didn't delete the list of search paths as advertised. --- ghc/compiler/main/DriverFlags.hs | 2 +- ghc/compiler/main/DriverState.hs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs index a2ef2a1b..cc8b772 100644 --- a/ghc/compiler/main/DriverFlags.hs +++ b/ghc/compiler/main/DriverFlags.hs @@ -259,7 +259,7 @@ static_flags = ) ) ------- Include/Import Paths ---------------------------------------- - , ( "i" , OptPrefix (addToDirList v_Import_paths) ) + , ( "i" , OptPrefix (addToOrDeleteDirList v_Import_paths) ) , ( "I" , Prefix (addToDirList v_Include_paths) ) ------- Libraries --------------------------------------------------- diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs index c6acf81..93729f2 100644 --- a/ghc/compiler/main/DriverState.hs +++ b/ghc/compiler/main/DriverState.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverState.hs,v 1.101 2004/03/05 15:09:37 stolz Exp $ +-- $Id: DriverState.hs,v 1.102 2004/03/24 10:50:35 simonmar Exp $ -- -- Settings for the driver -- @@ -211,6 +211,10 @@ GLOBAL_VAR(v_Framework_paths, [], [String]) GLOBAL_VAR(v_Cmdline_frameworks, [], [String]) #endif +addToOrDeleteDirList :: IORef [String] -> String -> IO () +addToOrDeleteDirList ref "" = writeIORef ref [] +addToOrDeleteDirList ref path = addToDirList ref path + addToDirList :: IORef [String] -> String -> IO () addToDirList ref path = do paths <- readIORef ref -- 1.7.10.4