summaryrefslogtreecommitdiff
path: root/utils/runghc
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-11-19 01:29:05 +0000
committerIan Lynagh <igloo@earth.li>2011-11-19 01:52:32 +0000
commit80e9070c77718b7ff0e913182e54842754726ce8 (patch)
tree12804916372a3675a7d1beb00bd41e70083c5edf /utils/runghc
parent042841713eb6468696eeb437de994c52eb7a858e (diff)
downloadhaskell-80e9070c77718b7ff0e913182e54842754726ce8.tar.gz
Improve the way we call "rm" in the build system; fixes trac #4916
We avoid calling "rm -rf" with no file arguments; this fixes cleaning on Solaris, where that fails. We also check for suspicious arguments: anything containing "..", starting "/", or containing a "*" (you need to call $(wildcard ...) yourself now if you really want globbing). This should make things a little safer.
Diffstat (limited to 'utils/runghc')
-rw-r--r--utils/runghc/ghc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk
index 7c6a34a190..8ec4e8d0b5 100644
--- a/utils/runghc/ghc.mk
+++ b/utils/runghc/ghc.mk
@@ -33,7 +33,7 @@ install_runhaskell: install_bins
"$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext) $(DESTDIR)$(bindir)/runhaskell$(exeext)
else
install_runhaskell:
- "$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/runhaskell"
+ $(call removeFiles,"$(DESTDIR)$(bindir)/runhaskell")
$(LN_S) runghc "$(DESTDIR)$(bindir)/runhaskell"
endif