From 54bb59ae99da47df2f7d69b9c56ef32176276996 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Sat, 17 Nov 2001 17:57:58 +0000
Subject: [PATCH]  Support compile on MacosX 10.1.1 (Timothy J. Wood)

---
 configure.in            |  7 ++++---
 driver/Makefile.in      |  4 ++--
 macosx.txt              |  2 +-
 tgt-fpga/Makefile.in    |  3 ++-
 tgt-fpga/configure.in   | 14 +++++++++++---
 tgt-null/Makefile.in    |  3 ++-
 tgt-pal/Makefile.in     |  3 ++-
 tgt-stub/Makefile.in    |  3 ++-
 tgt-verilog/Makefile.in |  3 ++-
 tgt-vvp/configure.in    | 14 +++++++++++---
 vpip/configure.in       | 14 +++++++++++---
 vvp/configure.in        |  8 ++++++++
 12 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/configure.in b/configure.in
index e8b5cbcba..62a899251 100644
--- a/configure.in
+++ b/configure.in
@@ -153,6 +153,7 @@ AC_MSG_RESULT($EXTRALIBS)
 # Darwin requires -no-cpp-precomp
 case "${host}" in
     *-*-darwin*)
+	CPPFLAGS="-no-cpp-precomp"
 	CFLAGS="-no-cpp-precomp"
 	;;
 esac
@@ -204,12 +205,12 @@ case "${host}" in
 	shared="-b"
 	;;
 
-     *-*-darwin1.4)
-	shared="-bundle -undefined suppress -flat_namespace"
+     *-*-darwin1.[0123])
+	shared="-bundle -undefined suppress"
 	;;
 
      *-*-darwin*)
-	shared="-bundle -undefined suppress"
+	shared="-bundle -undefined suppress -flat_namespace"
 	;;
 esac
 
diff --git a/driver/Makefile.in b/driver/Makefile.in
index e60f51242..d61a890b5 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.9 2001/11/12 18:47:32 steve Exp $"
+#ident "$Id: Makefile.in,v 1.10 2001/11/17 17:57:58 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -54,7 +54,7 @@ all: iverilog@EXEEXT@
 
 clean:
 	rm -f *.o lexor.c parse.c parse.h parse.output
-	rm -r cflexor.c cfparse.c cfparse.h cfparse.output
+	rm -f cflexor.c cfparse.c cfparse.h cfparse.output
 
 O = main.o build_string.o lexor.o parse.o cflexor.o cfparse.o
 
diff --git a/macosx.txt b/macosx.txt
index 85ddc8c28..162185dff 100644
--- a/macosx.txt
+++ b/macosx.txt
@@ -20,7 +20,7 @@
   ftp://ftp.gnu.org/gnu/gperf/gperf-2.7.2.tar.gz
 
 
-3)  Configure, build and install the Icarus Verilog sources.
+3)  Configure, build and install the Icarus Verilog sources as normal.
 
   The only change you need to make here is to use a configure command like:
 
diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in
index 3e6257d34..b4bd072ff 100644
--- a/tgt-fpga/Makefile.in
+++ b/tgt-fpga/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.3 2001/09/06 04:28:39 steve Exp $"
+#ident "$Id: Makefile.in,v 1.4 2001/11/17 17:57:58 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -40,6 +40,7 @@ INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@
 CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 all: fpga.tgt
diff --git a/tgt-fpga/configure.in b/tgt-fpga/configure.in
index 6aa4f85f0..9fc085310 100644
--- a/tgt-fpga/configure.in
+++ b/tgt-fpga/configure.in
@@ -13,6 +13,14 @@ AC_CYGWIN
 AC_SUBST(CYGWIN)
 AC_CHECK_HEADERS(malloc.h)
 
+# Darwin requires -no-cpp-precomp
+case "${host}" in
+    *-*-darwin*)
+	CPPFLAGS="-no-cpp-precomp"
+	CFLAGS="-no-cpp-precomp"
+	;;
+esac
+
 # The -fPIC flag is used to tell the compiler to make position
 # independent code. It is needed when making shared objects.
 
@@ -44,12 +52,12 @@ case "${host}" in
 	shared="-b"
 	;;
 
-     *-*-darwin1.4)
-	shared="-bundle -undefined suppress -flat_namespace"
+     *-*-darwin1.[0123])
+	shared="-bundle -undefined suppress"
 	;;
 
      *-*-darwin*)
-	shared="-bundle -undefined suppress"
+	shared="-bundle -undefined suppress -flat_namespace"
 	;;
 
 esac
diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in
index cb7f44946..d39a475fc 100644
--- a/tgt-null/Makefile.in
+++ b/tgt-null/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.5 2001/05/20 17:13:27 steve Exp $"
+#ident "$Id: Makefile.in,v 1.6 2001/11/17 17:57:58 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -41,6 +41,7 @@ INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@
 CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 all: null.tgt
diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in
index 001d205a9..60616e098 100644
--- a/tgt-pal/Makefile.in
+++ b/tgt-pal/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.7 2001/02/07 22:22:00 steve Exp $"
+#ident "$Id: Makefile.in,v 1.8 2001/11/17 17:57:58 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -41,6 +41,7 @@ INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@
 CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 all: pal.tgt
diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in
index 0c4294864..1cd0f279b 100644
--- a/tgt-stub/Makefile.in
+++ b/tgt-stub/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.8 2001/05/20 15:09:40 steve Exp $"
+#ident "$Id: Makefile.in,v 1.9 2001/11/17 17:57:58 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -41,6 +41,7 @@ INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@
 CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 all: stub.tgt
diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in
index b037368cc..d01201883 100644
--- a/tgt-verilog/Makefile.in
+++ b/tgt-verilog/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.7 2001/05/20 15:09:40 steve Exp $"
+#ident "$Id: Makefile.in,v 1.8 2001/11/17 17:57:58 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -41,6 +41,7 @@ INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@
 CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 all: verilog.tgt
diff --git a/tgt-vvp/configure.in b/tgt-vvp/configure.in
index fcc2be6e9..528f9c80f 100644
--- a/tgt-vvp/configure.in
+++ b/tgt-vvp/configure.in
@@ -13,6 +13,14 @@ AC_CYGWIN
 AC_SUBST(CYGWIN)
 AC_CHECK_HEADERS(malloc.h)
 
+# Darwin requires -no-cpp-precomp
+case "${host}" in
+    *-*-darwin*)
+	CPPFLAGS="-no-cpp-precomp"
+	CFLAGS="-no-cpp-precomp"
+	;;
+esac
+
 # The -fPIC flag is used to tell the compiler to make position
 # independent code. It is needed when making shared objects.
 
@@ -44,12 +52,12 @@ case "${host}" in
 	shared="-b"
 	;;
 
-     *-*-darwin1.4)
-	shared="-bundle -undefined suppress -flat_namespace"
+     *-*-darwin1.[0123])
+	shared="-bundle -undefined suppress"
 	;;
 
      *-*-darwin*)
-	shared="-bundle -undefined suppress"
+	shared="-bundle -undefined suppress -flat_namespace"
 	;;
 
 esac
diff --git a/vpip/configure.in b/vpip/configure.in
index b21f34d47..e48624e08 100644
--- a/vpip/configure.in
+++ b/vpip/configure.in
@@ -9,6 +9,14 @@ AC_CYGWIN
 AC_EXEEXT
 
 
+# Darwin requires -no-cpp-precomp
+case "${host}" in
+    *-*-darwin*)
+	CPPFLAGS="-no-cpp-precomp"
+	CFLAGS="-no-cpp-precomp"
+	;;
+esac
+
 WIN32=no
 AC_MSG_CHECKING("for shared library link flag")
 shared=-shared
@@ -21,11 +29,11 @@ case "${host}" in
      *-*-hpux*)
 	shared="-b"
 	;;
-     *-*-darwin1.4)
-	shared="-bundle -undefined suppress -flat_namespace"
+     *-*-darwin1.[0123])
+	shared="-bundle -undefined suppress"
 	;;
      *-*-darwin*)
-	shared="-bundle -undefined suppress"
+	shared="-bundle -undefined suppress -flat_namespace"
 	;;
 esac
 AC_SUBST(shared)
diff --git a/vvp/configure.in b/vvp/configure.in
index a1f90326c..118ad1356 100644
--- a/vvp/configure.in
+++ b/vvp/configure.in
@@ -42,6 +42,14 @@ fi
 AC_SUBST(DLLIB)
 
 
+# Darwin requires -no-cpp-precomp
+case "${host}" in
+    *-*-darwin*)
+	CPPFLAGS="-no-cpp-precomp"
+	CFLAGS="-no-cpp-precomp"
+	;;
+esac
+
 # see how we can give some resource usage stats with -v
 # Linux does not provide mem stats in rusage, use /proc/self/statm.