summaryrefslogtreecommitdiff
path: root/pkgtools/bootstrap-mk-files
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2013-10-25 13:53:03 +0000
committerjperkin <jperkin@pkgsrc.org>2013-10-25 13:53:03 +0000
commitee3d21f97a7be093213857f80337eefbb8bdf1ee (patch)
tree90ef6269e0656d29429dbd379ec5b0f2118df291 /pkgtools/bootstrap-mk-files
parent53f7869a8e329748a0e042585f52a724b98ba319 (diff)
downloadpkgsrc-ee3d21f97a7be093213857f80337eefbb8bdf1ee.tar.gz
Use the compiler front-end to generate shared libraries on OSX - the
native linker uses different arguments compared to GNU ld. Fixes various builds. Bump version to 20131025.
Diffstat (limited to 'pkgtools/bootstrap-mk-files')
-rw-r--r--pkgtools/bootstrap-mk-files/Makefile4
-rw-r--r--pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile
index 77198e14ba4..23208f3ea0a 100644
--- a/pkgtools/bootstrap-mk-files/Makefile
+++ b/pkgtools/bootstrap-mk-files/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2013/09/12 10:56:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.38 2013/10/25 13:53:03 jperkin Exp $
-DISTNAME= bootstrap-mk-files-20130912
+DISTNAME= bootstrap-mk-files-20131025
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk b/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk
index 7f80376458a..723d4ef1dd9 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.bsd.lib.mk,v 1.3 2009/05/12 23:21:10 minskim Exp $
+# $NetBSD: Darwin.bsd.lib.mk,v 1.4 2013/10/25 13:53:03 jperkin Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.if !target(__initialized__)
@@ -375,14 +375,14 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
@echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
@rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
.if defined(DESTDIR)
- $(LD) -nostdlib -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
+ $(CC) -nostdlib -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
${SHLIB_LDSTARTFILE} \
--whole-archive ${SOLIB} \
--no-whole-archive ${LDADD} \
-L${DESTDIR}${LIBDIR} -R${LIBDIR} \
${SHLIB_LDENDFILE}
.else
- $(LD) -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
+ $(CC) -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
${SHLIB_LDSTARTFILE} \
--whole-archive ${SOLIB} --no-whole-archive ${LDADD} \
${SHLIB_LDENDFILE}