svn commit: r317968 - head

John Baldwin jhb at FreeBSD.org
Mon May 8 18:51:15 UTC 2017


Author: jhb
Date: Mon May  8 18:51:13 2017
New Revision: 317968
URL: https://svnweb.freebsd.org/changeset/base/317968

Log:
  Honor WITHOUT_LIB32 on mips64.
  
  The closing paren for the list of architectures that should enable LIB32
  by default was in the wrong place resulting in LIB32 always be enabled on
  mips64 regardless of WITH_LIB32/WITHOUT_LIB32.
  
  Submitted by:	Alex Richardson <Alexander.Richardson at cl.cam.ac.uk>
  Obtained from:	CheriBSD
  Sponsored by:	DARPA / AFRL

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon May  8 18:42:38 2017	(r317967)
+++ head/Makefile.inc1	Mon May  8 18:51:13 2017	(r317968)
@@ -628,7 +628,7 @@ XCFLAGS+=	${BFLAGS}
 .endif
 
 .if ${MK_LIB32} != "no" && (${TARGET_ARCH} == "amd64" || \
-    ${TARGET_ARCH} == "powerpc64") || ${TARGET_ARCH:Mmips64*} != ""
+    ${TARGET_ARCH} == "powerpc64" || ${TARGET_ARCH:Mmips64*} != "")
 LIBCOMPAT= 32
 .include "Makefile.libcompat"
 .elif ${MK_LIBSOFT} != "no" && ${TARGET_ARCH} == "armv6"


More information about the svn-src-all mailing list