X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=glafp-utils%2FmkdependC%2FmkdependC.prl;h=5f00def2bfcfa5840a1353d729ebd9ba3370103a;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=6caa34980f774b515a7c28575b41be6bd93ac86a;hpb=d9f022ce0add3e1ce813e70af38efd95caf1420c;p=ghc-hetmet.git

diff --git a/glafp-utils/mkdependC/mkdependC.prl b/glafp-utils/mkdependC/mkdependC.prl
index 6caa349..5f00def 100644
--- a/glafp-utils/mkdependC/mkdependC.prl
+++ b/glafp-utils/mkdependC/mkdependC.prl
@@ -2,10 +2,7 @@
 # This stub of perl assumes that the following two
 # variables are prepended:
 #
-#  RAWCPP
-#  HOSTPLATFORM
-#
-# tries to work like mkdependC
+# TMPDIR CPP
 #
 # ToDo: strip out all the .h junk
 #
@@ -21,23 +18,26 @@ $End_magic_str = "# DO NOT DELETE: End of C dependencies\n";
 $Obj_suffix = '.o';
 @Defines = ();
 $Include_dirs = '';
-$Col_width = 78; # ignored
 $Makefile = '';
 @Src_files = ();
 
-# the following is a hack, so we can use RAWCPP, but there you go;
-# put in just enough #defines that mkdependC will not barf.
-$HostPlatform = ${HOSTPLATFORM};
-
-if ( $HostPlatform =~ /^i386-/ ) {
-    push(@Defines, '-D__i386__');
-}
-if ( $HostPlatform =~ /^sparc-/ ) {
-    push(@Defines, '-D__sparc__');
+if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
+    $Tmp_prefix = $ENV{'TMPDIR'} . "/mkdependC$$";
+} else {
+    $Tmp_prefix ="${TMPDIR}/mkdependC$$";
+    $ENV{'TMPDIR'} = "${TMPDIR}"; # set the env var as well
 }
-if ( $HostPlatform =~ /-solaris2$/ ) {
-    push(@Defines, '-D__svr4__');
+
+$tempfile = '';
+
+sub quit_upon_signal { 
+  if (-f $tempfile) {
+	print STDERR "Deleting $tempfile .. \n"; 
+	unlink $tempfile;
+   }
 }
+$SIG{'INT'}  = 'quit_upon_signal';
+$SIG{'QUIT'} = 'quit_upon_signal';
 
 &mangle_command_line_args();
 
@@ -52,7 +52,6 @@ if ( ! $Makefile && -f 'makefile' ) {
 @Depend_lines = ();
 %Depend_seen = ();
 
-print STDERR "CPP defines=@Defines\n" if $Verbose;
 print STDERR "Include_dirs=$Include_dirs\n" if $Verbose;
 
 foreach $sf (@Src_files) {
@@ -153,9 +152,17 @@ sub slurp_file { # follows an example in the `open' item in perl man page
 
     $fname = &tidy_dir_names($fname);
 
-    unless (open($fhandle, "${RAWCPP} $Include_dirs @Defines $fname |")) {
-         die "$Pgm: Can't open $fname: $!\n";
-    }
+    $tempfile = "$Tmp_prefix.i";
+
+    # ${CPP} better be 'gcc -E', or the -x option will fail...
+    $result = system("${CPP} $Include_dirs @Defines -x c $fname -o $tempfile");
+    if ($result != 0) {
+	unlink($tempfile);
+	exit($result);
+    };
+
+    open($fhandle, $tempfile) || die "$Pgm: Can't open $tempfile: $!\n";
+
     line: while (<$fhandle>) {
 	next line if ! /^#/;
 	next line if /^#(ident|pragma)/;
@@ -175,6 +182,9 @@ sub slurp_file { # follows an example in the `open' item in perl man page
 	# depend on the de-litified versions (which have better info)
 	# don't let a file depend on itself
 	next line if /^\/usr\/include/;
+	# Hack - the cygwin32 dir structure is odd!
+	next line if /H-i386-cygwin32\/i386-cygwin32/;
+	next line if /H-i386-cygwin32\/lib\/gcc-lib\/i386-cygwin32/;
 	next line if /\/gcc-lib\/[^\/\n]+\/[\.0-9]+\/include\//;
 	next line if /\/gnu\/[^-\/]+-[^-\/]+-[^-\/]+\/include\//;
 	next line if /\/yaccpar/;
@@ -194,6 +204,8 @@ sub slurp_file { # follows an example in the `open' item in perl man page
 	$Depend_seen{$depend} = 1;
     }
     close($fhandle);
+    unlink($tempfile);
+    $tempfile = '';  # for quit_upon_signal
 }
 
 sub tidy_dir_names { # rm various pernicious dir-name combinations...