[lmi-commits] [5144] Accommodate recent MinGW gcc releases

[Greg Chicares]

Revision: 5144
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5144
Author:   chicares
Date:     2011-02-10 22:19:19 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
Accommodate recent MinGW gcc releases

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/mpatrol-mingw-GNUmakefile

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-02-10 22:18:09 UTC (rev 5143)
+++ lmi/trunk/ChangeLog 2011-02-10 22:19:19 UTC (rev 5144)
@@ -27606,3 +27606,14 @@
   zero_test.cpp
 Update copyright notices.
 
+20110210T2218Z <address@hidden> [654]
+
+  GNUmakefile
+  workhorse.make
+Temporarily work around problems with nondefault 'build_type'.
+
+20110210T2219Z <address@hidden> [654]
+
+  mpatrol-mingw-GNUmakefile
+Accommodate recent MinGW gcc releases.
+

Modified: lmi/trunk/mpatrol-mingw-GNUmakefile
===================================================================
--- lmi/trunk/mpatrol-mingw-GNUmakefile 2011-02-10 22:18:09 UTC (rev 5143)
+++ lmi/trunk/mpatrol-mingw-GNUmakefile 2011-02-10 22:19:19 UTC (rev 5144)
@@ -106,6 +106,16 @@
 
 ARCHIVE_MPTOOLS = lib$(MPTOOLS).a
 
+ifeq ($(CC),gcc)
+  gcc_version := $(shell $(CC) -dumpversion)
+endif
+
+# libiberty requires libintl for at least some MinGW gcc-4.x releases.
+
+ifneq (,$(findstring x4,x$(gcc_version)))
+  libiberty_requirements := -lintl
+endif
+
 # Rules
 
 .SUFFIXES: .c .o .ts.o
@@ -119,11 +129,7 @@
 all: $(ARCHIVE_MPATROL) $(SHARED_MPATROL) $(ARCHTS_MPATROL) $(SHARTS_MPATROL) \
        $(ARCHIVE_MPALLOC) $(SHARED_MPALLOC) $(ARCHIVE_MPTOOLS) \
        mpatrol.exe mprof.exe mptrace.exe mleak.exe
-  ifeq ($(CC),gcc)
-       @echo 'gcc version: $(shell $(CC) -dumpversion)'
-  else
-       @echo 'compiler: $(CC)'
-  endif
+       @echo 'compiler: $(CC); gcc version: $(gcc_version)'
 
 $(ARCHIVE_MPATROL): $(ARCHIVE_MPTOBJS)
        $(AR) $(ARFLAGS) $@ $(ARCHIVE_MPTOBJS)
@@ -134,7 +140,7 @@
          -Wl,--out-implib=$(IMPLIB_MPATROL) \
          -Wl,--allow-multiple-definition \
          -o$@ $(SHARED_MPTOBJS) \
-         -lbfd -liberty -limagehlp
+         -lbfd -liberty $(libiberty_requirements) -limagehlp
 
 $(OBJECT_MPATROL): $(SOURCE)/library.c
        $(CC) $(CFLAGS) $(OFLAGS) -c -o$@ $<
@@ -148,7 +154,7 @@
          -Wl,--out-implib=$(IMPLTS_MPATROL) \
          -Wl,--allow-multiple-definition \
          -o$@ $(SHARTS_MPTOBJS) \
-         -lbfd -liberty -limagehlp
+         -lbfd -liberty $(libiberty_requirements) -limagehlp
 
 $(OBJTS_MPATROL): $(SOURCE)/library.c
        $(CC) $(CFLAGS) $(OFLAGS) $(TFLAGS) -c -o$@ $<