Fixes for Darwin

2 files changed, 21 insertions, 14 deletions

diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile
index 426aa4f1174..1c9d3d52e42 100644
--- a/lang/gcc48-libs/Makefile
+++ b/lang/gcc48-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/05/10 14:14:59 richard Exp $
+# $NetBSD: Makefile,v 1.14 2014/05/20 19:12:36 adam Exp $
 
 PKGNAME=	${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}
 PKGREVISION=	5
@@ -30,7 +30,7 @@ do-install:
 
 # libgcc_s has no libtool la file.
 	${INSTALL_LIB} \
-		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgcc/libgcc_s.so* \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgcc/libgcc_s.* \
 		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
 
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
@@ -45,16 +45,13 @@ do-install:
 		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libitm/libitm.la \
 		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
 
+.if ${OPSYS} == "Darwin"
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
-		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libobjc/libobjc.la \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libobjc/libobjc-gnu.la \
 		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
-
+.else
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
-		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libstdc++-v3/src/libstdc++.la \
-		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
-
-	${LIBTOOL} --mode=install ${INSTALL_LIB} \
-		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libssp/libssp.la \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libobjc/libobjc.la \
 		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
 
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
@@ -66,6 +63,15 @@ do-install:
 
 	${INSTALL_PROGRAM} ${WRKSRC}/${OBJDIR}/gcc/lto-wrapper \
 		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
+.endif
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libstdc++-v3/src/libstdc++.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libssp/libssp.la \
+		${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
 
 .if !empty(PKG_OPTIONS:Mgcc-java)
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
diff --git a/lang/gcc48-libs/PLIST b/lang/gcc48-libs/PLIST
index 540c99e3264..eb3d0563446 100644
--- a/lang/gcc48-libs/PLIST
+++ b/lang/gcc48-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/04/22 20:46:41 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/05/20 19:12:36 adam Exp $
 ${PLIST.java}gcc48/lib/gcj-${PKGVERSION}-14/libjvm.la
 gcc48/lib/libatomic.la
 gcc48/lib/libgcc_s.so
@@ -9,11 +9,12 @@ gcc48/lib/libgfortran.la
 ${PLIST.java}gcc48/lib/libgij.la
 gcc48/lib/libgomp.la
 gcc48/lib/libitm.la
-gcc48/lib/libobjc.la
+${PLIST.darwin}gcc48/lib/libobjc-gnu.la
+${PLIST.unix}gcc48/lib/libobjc.la
 gcc48/lib/libssp.la
 gcc48/lib/libstdc++.la
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/liblto_plugin.la
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/lto-wrapper
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/lto1
+${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/liblto_plugin.la
+${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/lto-wrapper
+${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/4.8.2/lto1
 ${PLIST.java}java/gcc48/jre/lib/${JAVA_MACHINE_ARCH}/client/libjvm.so
 ${PLIST.java}java/gcc48/jre/lib/${JAVA_MACHINE_ARCH}/server/libjvm.so