Module Name:    src
Committed By:   mrg
Date:           Thu Sep 22 20:55:17 UTC 2011

Modified Files:
        src/external/gpl3/gcc/lib/libgomp: Makefile

Log Message:
only install libgomp.spec for the native build.  look in the archdir
for libgomp.spec.

XXX: FILES/FILESDIR isn't working here for me yet.  no idea why.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgomp/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.2 src/external/gpl3/gcc/lib/libgomp/Makefile:1.3
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.2	Wed Sep 21 02:12:00 2011
+++ src/external/gpl3/gcc/lib/libgomp/Makefile	Thu Sep 22 20:55:17 2011
@@ -1,7 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2011/09/21 02:12:00 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2011/09/22 20:55:17 mrg Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
+# XXX
+NOLINT=	# defined
+
 .include <bsd.own.mk>
 DIST=	${NETBSDSRCDIR}/external/gpl3/gcc/dist
 
@@ -34,25 +37,30 @@
 	affinity.c
 
 GOMP_MACHINE_ARCH?=	${MACHINE_ARCH}
+ARCHDIR=		${.CURDIR}/arch/${GOMP_MACHINE_ARCH}
 
 CPPFLAGS+= \
 	-DHAVE_CONFIG_H \
 	-I${DIST}/libgomp \
 	-I${DIST}/libgomp/config/posix \
 	-I${DIST}/libgcc \
-	-I${.CURDIR}/arch/${GOMP_MACHINE_ARCH}
+	-I${ARCHDIR}
 CFLAGS+=-pthread
 
-# This is where GCC looks for it.
-FILES=		libgomp.spec
-FILESDIR=	${LIBDIR}
-
 # libgomp.so.1.0 is in GCC 4.5.
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
 
 LDFLAGS+=	-Wl,--version-script,${DIST}/libgomp/libgomp.map
 
-.PATH:	${DIST}/libgomp ${DIST}/libgomp/config/posix
+.PATH:	${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix
 
 .include <bsd.lib.mk>
+
+.if ${GOMP_MACHINE_ARCH} == ${MACHINE_ARCH}
+# This is where GCC looks for it.
+FILES=		libgomp.spec
+FILESDIR=	${LIBDIR}
+.endif
+
+.include <bsd.files.mk>

Reply via email to