Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gcc/lib/libgomp only install libgomp.spec for ...



details:   https://anonhg.NetBSD.org/src/rev/22fd7efab391
branches:  trunk
changeset: 769773:22fd7efab391
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Sep 22 20:55:17 2011 +0000

description:
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.

diffstat:

 external/gpl3/gcc/lib/libgomp/Makefile |  22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r dfe23e5add70 -r 22fd7efab391 external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile    Thu Sep 22 20:23:55 2011 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile    Thu Sep 22 20:55:17 2011 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index