summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-05-04 16:29:14 +0000
committerjoerg <joerg@pkgsrc.org>2012-05-04 16:29:14 +0000
commitbbedc2e5cfc20230bbaf0c0e8a467db05cd8c725 (patch)
treea2130c29aad54404b82e8f50ca8ce2b72555d470 /multimedia
parentf737a891bc9a300527f6afbd171268c131bc9cc7 (diff)
downloadpkgsrc-bbedc2e5cfc20230bbaf0c0e8a467db05cd8c725.tar.gz
Don't use the integrated assembler with LLVM for now, too much ambigious
assembler usage on x86.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mplayer-share/Makefile.common8
1 files changed, 7 insertions, 1 deletions
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 70947af7130..ff800708f43 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2011/05/18 08:28:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.50 2012/05/04 16:29:14 joerg Exp $
# used by multimedia/gmplayer/Makefile
# used by multimedia/mencoder/Makefile
# used by multimedia/mplayer/Makefile
@@ -73,4 +73,10 @@ SUBST_MESSAGE.arm_bswap= Fixing "arm/bswap.h" conflict in libavutil
CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2
.endif
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+= -no-integrated-as
+.endif
+
.include "../../multimedia/mplayer-share/options.mk"