diff options
| author | wiz <wiz@pkgsrc.org> | 2013-02-21 22:39:58 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-02-21 22:39:58 +0000 |
| commit | 58e872b0b6cb317556ee744e553e46d7152f17c9 (patch) | |
| tree | 430e60892c471f9411953fa8f12f6c8bf30a78d8 /pkgtools | |
| parent | 6cc11d15dd0f6e1c9bb449e3173133a1a8e7be89 (diff) | |
| download | pkgsrc-58e872b0b6cb317556ee744e553e46d7152f17c9.tar.gz | |
Fix build with clang.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 8 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 73f7d100091..efcced0ea20 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.192 2013/02/14 09:13:41 obache Exp $ +# $NetBSD: Makefile,v 1.193 2013/02/21 22:41:37 wiz Exp $ # Notes to package maintainers: # @@ -79,6 +79,12 @@ FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q} \ MESSAGE_SUBST+= PKGVULNDIR=${PKG_DBDIR:Q} \ EGDIR=${EGDIR:Q} +.include "../../mk/compiler.mk" + +.if !empty(CC_VERSION:Mclang*) +MAKE_FLAGS+= ACTIVE_CC=clang +.endif + .include "../../mk/bsd.prefs.mk" VERSION!= ${AWK} '/PKGTOOLS_VERSION/ {print $$3}' \ diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 2c655103a92..56fc3779b2d 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2012/09/11 23:19:40 asau Exp $ +# $NetBSD: Makefile,v 1.63 2013/02/21 22:39:58 wiz Exp $ DISTNAME= rpm2pkg-3.2.3 CATEGORIES= pkgtools @@ -23,6 +23,12 @@ WRKSRC= ${WRKDIR} INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin +.include "../../mk/compiler.mk" + +.if !empty(CC_VERSION:Mclang*) +MAKE_FLAGS+= ACTIVE_CC=clang +.endif + .include "../../mk/bsd.prefs.mk" .if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" |