summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2012-09-09 20:14:09 +0000
committerPaul Smith <psmith@gnu.org>2012-09-09 20:14:09 +0000
commit145661a54151e13f05c86a526d7490e12ba79ed6 (patch)
treeb0941e75ce8366bfdf82684318af4e2096e89e6c
parenta95dc485fa060a57916a091b6990db0b76f4bdab (diff)
downloadgunmake-145661a54151e13f05c86a526d7490e12ba79ed6.tar.gz
Savannah bug #37179: Use alternate shared library syntax for MacOS.
-rw-r--r--ChangeLog3
-rw-r--r--default.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ffe1a5d..fefd285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-09-09 Paul Smith <psmith@gnu.org>
+ * default.c (default_variables): Use a correct default LIBPPATERNS
+ for MacOS. Fixes Savannah bug #37197.
+
* read.c (record_files): Reset the default macro values if .POSIX
is set. Fixes Savannah bug #37069.
(parse_file_seq): Break out of an infinite loop if we're not
diff --git a/default.c b/default.c
index 9747b33..2771809 100644
--- a/default.c
+++ b/default.c
@@ -514,15 +514,15 @@ static const char *default_variables[] =
"SCCS_OUTPUT_OPTION", "-G$@",
#endif
-#ifdef _AMIGA
+#if defined(_AMIGA)
".LIBPATTERNS", "%.lib",
-#else
-#ifdef __MSDOS__
+#elif defined(__MSDOS__)
".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a",
+#elif defined(__APPLE__)
+ ".LIBPATTERNS", "lib%.dylib lib%.a",
#else
".LIBPATTERNS", "lib%.so lib%.a",
#endif
-#endif
#endif /* !VMS */
0, 0