[src/trunk]: src/share/mk Add -fno-merge-constants (as the xsrc build does to...

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

details:   https://anonhg.NetBSD.org/src/rev/e00550d32708
branches:  trunk
changeset: 580041:e00550d32708
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 06 08:32:11 2005 +0000

description:
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 2d5df721ab23 -r e00550d32708 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Wed Apr 06 04:32:59 2005 +0000
+++ b/share/mk/bsd.x11.mk       Wed Apr 06 08:32:11 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.48 2005/03/26 10:31:51 martin Exp $
+#      $NetBSD: bsd.x11.mk,v 1.49 2005/04/06 08:32:11 martin Exp $
 
 .include <bsd.init.mk>
 
@@ -76,7 +76,8 @@
     ${MACHINE} == "sgimips"    || \
     ${MACHINE} == "sparc64"
 #      LOADABLE
-X11FLAGS.LOADABLE=     -DXFree86LOADER -DIN_MODULE -DXFree86Module
+X11FLAGS.LOADABLE=     -DXFree86LOADER -DIN_MODULE -DXFree86Module \
+                       -fno-merge-constants
 .endif
 
 # Extract X11VERSION