From: sof <unknown>
Date: Fri, 17 Jan 2003 16:05:10 +0000 (+0000)
Subject: [project @ 2003-01-17 16:05:09 by sof]
X-Git-Tag: Approx_11550_changesets_converted~1256
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f955b9b087908bbde225a4ec25b66aa4b8126e46;p=ghc-hetmet.git

[project @ 2003-01-17 16:05:09 by sof]
for mingw builds, redirect to NUL
---

diff --git a/glafp-utils/mkdependC/Makefile b/glafp-utils/mkdependC/Makefile
index 3a6ed94..9a96fdf 100644
--- a/glafp-utils/mkdependC/Makefile
+++ b/glafp-utils/mkdependC/Makefile
@@ -13,7 +13,7 @@ SCRIPT_OBJS=mkdependC.prl
 # Prepend (perl) bindings for these Makefile variables
 # when creating `mkdependC' (a more flexible way of doing msub).
 #
-SCRIPT_SUBST_VARS=DEFAULT_TMPDIR CPP
+SCRIPT_SUBST_VARS=DEFAULT_TMPDIR CPP BUILDPLATFORM
 
 CLEAN_FILES += $(SCRIPT_PROG)
 INTERP=perl
diff --git a/glafp-utils/mkdependC/mkdependC.prl b/glafp-utils/mkdependC/mkdependC.prl
index d22f6d9..f915765 100644
--- a/glafp-utils/mkdependC/mkdependC.prl
+++ b/glafp-utils/mkdependC/mkdependC.prl
@@ -1,8 +1,8 @@
 #
-# This stub of perl assumes that the following two
-# variables are prepended:
+# This perl script template assumes that definitions for
+# the following variables are prepended:
 #
-# DEFAULT_TMPDIR CPP
+# DEFAULT_TMPDIR CPP BUILDPLATFORM
 #
 # ToDo: strip out all the .h junk
 #
@@ -22,6 +22,12 @@ $Makefile = '';
 @Src_files = ();
 @File_suffix = ();
 $baseName='';
+$ignore_output='> /dev/null';
+
+if ( ${BUILDPLATFORM} == "i386-unknown-mingw32" ) {
+    # Assuming the underlying perl uses cmd to exec system() calls.
+    $ignore_output = ">nul";
+}
 
 if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
     $Tmp_prefix = $ENV{'TMPDIR'} . "/mkdependC$$";
@@ -166,13 +172,11 @@ sub slurp_file { # follows an example in the `open' item in perl man page
 
     # ${CPP} better be 'gcc -E', or the -x option will fail...
     # ..and the -MM & -MMD.
-    $result = system("${CPP} -MM -MMD $Include_dirs @Defines -x c $fname > /dev/null");
+    $result = system("${CPP} -MM -MMD $Include_dirs @Defines -x c $fname $ignore_output");
  
     if ($result != 0) {
         # On the cheesy side..we do want to know what went wrong, so
-	# re-run the command. (This also has the beneficial effect
-	# of fixing a redirection problem with gcc-2.95 builds used with
-	# mingw32.)
+	# re-run the command.
 	$result = system("${CPP} -MM -MMD $Include_dirs @Defines -x c $fname ");
 	if ($result != 0) {
 	   unlink($tempfile);