From 198ab6464e41d449a96d3b2b914ccf1d91e5df17 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Fri, 17 Apr 1998 12:19:28 +0000
Subject: [PATCH] [project @ 1998-04-17 12:19:24 by sof] Don't feed mkdependC
-D__GNUC__ + fix-fix to mkdependC
---
ghc/lib/misc/cbits/Makefile | 5 +----
glafp-utils/mkdependC/mkdependC.prl | 3 ++-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ghc/lib/misc/cbits/Makefile b/ghc/lib/misc/cbits/Makefile
index 2ab4bcfd6e65..be6601f20046 100644
--- a/ghc/lib/misc/cbits/Makefile
+++ b/ghc/lib/misc/cbits/Makefile
@@ -14,10 +14,7 @@ ifneq "$(HAVE_READLINE)" "YES"
C_SRCS := $(filter-out ghcReadline.c,$(C_SRCS))
endif
-# ToDo: properly
-# -D__GNUC__ : added to turn off noise from byteorder.h with 2.7.2 / Solaris-2.3
-#
-SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) -D__GNUC__
+SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR)
LIBRARY=libHSmisc_cbits.a
diff --git a/glafp-utils/mkdependC/mkdependC.prl b/glafp-utils/mkdependC/mkdependC.prl
index 686b59dba735..5f00def2bfcf 100644
--- a/glafp-utils/mkdependC/mkdependC.prl
+++ b/glafp-utils/mkdependC/mkdependC.prl
@@ -28,7 +28,7 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
$ENV{'TMPDIR'} = "${TMPDIR}"; # set the env var as well
}
-$tempfile = "$Tmp_prefix.i";
+$tempfile = '';
sub quit_upon_signal {
if (-f $tempfile) {
@@ -152,6 +152,7 @@ sub slurp_file { # follows an example in the `open' item in perl man page
$fname = &tidy_dir_names($fname);
+ $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");
--
GitLab