From 236c8996424c9acd711f39b8c806cb77276275c2 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Tue, 20 Jun 2000 11:20:50 +0000
Subject: [PATCH] [project @ 2000-06-20 11:20:50 by simonmar] mkdependHS
doesn't understand the -o option anymore; instead it grokss ghc's -osuf
option. We never really used this, and it behaves strangely when mixed with
-s, but at least now it doesn't conflict with GHC's -opt<blah> options.
---
ghc/utils/mkdependHS/mkdependHS.prl | 16 ++++++++--------
mk/target.mk | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl
index 91a7714d06c2..c665c948335a 100644
--- a/ghc/utils/mkdependHS/mkdependHS.prl
+++ b/ghc/utils/mkdependHS/mkdependHS.prl
@@ -27,6 +27,7 @@ Options recognised wherever they occur (mkdependHS or GHC):
-package <blah> This program uses this GHC system library; take
appropriate action (e.g., recognise when they are
"import"ing a module from that library).
+ -osuf <osuf> Use <osuf> as the "object file" suffix ( default: o)
mkdependHS-specific options (not between --'s):
@@ -36,7 +37,6 @@ mkdependHS-specific options (not between --'s):
-f blah Use "blah" as the makefile, rather than "makefile"
or "Makefile".
-cpp Wash the input files through cpp(1).
- -o <osuf> Use <osuf> as the "object file" suffix ( default: o)
-s <suf> Make extra dependencies for files with
suffix <suf><osuf>; thus, "-o hc -s _a" will
make dependencies both for .hc files and for .a_hc
@@ -240,6 +240,13 @@ sub mangle_command_line_args {
push(@Syslibs, 'concurrent');
} elsif (/^-#include(.*)/) {
&grab_arg_arg(*Args,'-#include',$1);
+ } elsif ( /^-osuf(.*)/ ) {
+ local($suff) = &grab_arg_arg(*Args,'-osuf',$1);
+ # Weed out existing entry .. there must be a better way of doing this
+ # with arrays (non-assoc) ! -- sof
+ @Obj_suffix = grep(!/$suff/,@Obj_suffix);
+ push(@Obj_suffix, $suff);
+
} elsif ($Dashdashes_seen != 1) { # not between -- ... --
if ( /^-v$/ ) {
$Verbose++;
@@ -247,15 +254,8 @@ sub mangle_command_line_args {
$Warnings = 0;
} elsif ( /^-f(.*)/ && !$ProcessingOptions ) {
$Makefile = &grab_arg_arg(*Args,'-f',$1);
- } elsif ( /^-o(.*)/ ) {
- local($suff) = &grab_arg_arg(*Args,'-o',$1);
- # Weed out existing entry .. there must be a better way of doing this
- # with arrays (non-assoc) ! -- sof
- @Obj_suffix = grep(!/$suff/,@Obj_suffix);
- push(@Obj_suffix, $suff);
#
# --exclude-module=mod => it's stable, trust me!
-
} elsif ( /^-(x|-exclude-module=)(.*)/ ) {
local($thing) = &grab_arg_arg(*Args,$1,$2);
$IgnoreMe{$thing} = 'Y';
diff --git a/mk/target.mk b/mk/target.mk
index 2158db340c5e..0f98fe0ac35e 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -181,7 +181,7 @@ ifneq "$(MKDEPENDC_SRCS)" ""
$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS)
endif
ifneq "$(MKDEPENDHS_SRCS)" ""
- $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS)
+ $(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS)
endif
--
GitLab