Module Name:    src
Committed By:   christos
Date:           Mon Apr 26 21:32:49 UTC 2021

Modified Files:
        src/external/mit/xorg/lib/pixman: Makefile

Log Message:
Don't try to override an existing -march


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/pixman/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.37 src/external/mit/xorg/lib/pixman/Makefile:1.38
--- src/external/mit/xorg/lib/pixman/Makefile:1.37	Sun Apr 25 19:23:19 2021
+++ src/external/mit/xorg/lib/pixman/Makefile	Mon Apr 26 17:32:49 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.37 2021/04/25 23:23:19 christos Exp $
+#	$NetBSD: Makefile,v 1.38 2021/04/26 21:32:49 christos Exp $
 
 NOLINT=	1	# defined
 
@@ -90,7 +90,7 @@ AFLAGS+=	${${ACTIVE_CC} == "clang" :? -f
 #CPPFLAGS+=	-DUSE_ARM_IWMMXT
 .endif
 
-.if !empty(MACHINE_ARCH:Mmips*64el)
+.if !empty(MACHINE_ARCH:Mmips*64el) && empty(COPTS:M-march=*)
 # Loongson MMI
 SRCS+=		pixman-mmx.c
 CPPFLAGS+=	-DUSE_LOONGSON_MMI

Reply via email to