diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl index 25e3deb3de44dd18daebd27f6a5a6d6250392c4c..2b697244a8ac4a4de1b10991b4924a8a534ba474 100644 --- a/ghc/driver/ghc.lprl +++ b/ghc/driver/ghc.lprl @@ -2457,7 +2457,7 @@ sub add_syslib { push(@SysLibrary, "-lHS$syslib"); push(@SysLibrary, "-lHS${syslib}_cbits") - unless $syslib eq 'contrib' || $syslib eq 'exts' || $syslib eq 'conc'; + unless $syslib eq 'contrib' || $syslib eq 'exts' || $syslib eq 'concurrent'; #HACK! they have no cbits } \end{code} @@ -2766,7 +2766,7 @@ arg: while($_ = $Args[0]) { #--------- ticky/concurrent/parallel ----------------------------------- # we sort out the details a bit later on - /^-concurrent$/ && do { $CONCURing = 'c'; &add_syslib('conc'); next arg; }; + /^-concurrent$/ && do { $CONCURing = 'c'; &add_syslib('concurrent'); next arg; }; # concurrent Haskell; implies -syslib conc /^-gransim$/ && do { $GRANing = 'g'; next arg; }; # GranSim /^-ticky$/ && do { $TICKYing = 't'; next arg; }; # ticky-ticky diff --git a/ghc/lib/concurrent/Makefile b/ghc/lib/concurrent/Makefile index 9fb21cc35ad2427f373ef889e407414a8e9d94f9..e492a340c91090cc0a280283a8a97097a2e13105 100644 --- a/ghc/lib/concurrent/Makefile +++ b/ghc/lib/concurrent/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1998/04/16 12:50:50 sof Exp $ +# $Id: Makefile,v 1.5 1998/05/05 12:53:29 sof Exp $ # # Makefile for concurrent libraries. # @@ -12,7 +12,7 @@ WAYS=$(GhcLibWays) # Setting the standard variables # -LIBRARY = libHSconc$(_way).a +LIBRARY = libHSconcurrent$(_way).a HS_SRCS = $(wildcard *.lhs) HS_OBJS = $(HS_SRCS:.lhs=.$(way_)o) LIBOBJS = $(HS_OBJS)