[src/netbsd-3]: src/share/mk Pull up revision 1.49 (requested by jmc in ticke...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/22a6aa7f6482
branches:  netbsd-3
changeset: 575274:22a6aa7f6482
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 22:38:24 2005 +0000

description:
Pull up revision 1.49 (requested by jmc in ticket #114):
Add -fno-merge-constants (as the xsrc build does too) to make the module
loader work with the gcc versions we use now. No idea why i386 apparently
was not affected by this.

diffstat:

 share/mk/bsd.x11.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 4890b7a3e2ea -r 22a6aa7f6482 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Wed Apr 06 22:38:04 2005 +0000
+++ b/share/mk/bsd.x11.mk       Wed Apr 06 22:38:24 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.45.2.1 2005/04/06 21:08:07 tron Exp $
+#      $NetBSD: bsd.x11.mk,v 1.45.2.2 2005/04/06 22:38:24 tron Exp $
 
 .include <bsd.init.mk>
 
@@ -75,7 +75,8 @@
     ${MACHINE} == "macppc"     || \
     ${MACHINE} == "sgimips"
 #      LOADABLE
-X11FLAGS.LOADABLE=     -DXFree86LOADER -DIN_MODULE -DXFree86Module
+X11FLAGS.LOADABLE=     -DXFree86LOADER -DIN_MODULE -DXFree86Module \
+                       -fno-merge-constants
 .endif
 
 # Extract X11VERSION