From owner-svn-src-all@freebsd.org  Wed Mar  7 17:18:46 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8231F41FC9;
 Wed,  7 Mar 2018 17:18:46 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B7EC823A2;
 Wed,  7 Mar 2018 17:18:46 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 865E624AE1;
 Wed,  7 Mar 2018 17:18:46 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w27HIkla030722;
 Wed, 7 Mar 2018 17:18:46 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w27HIkLe030721;
 Wed, 7 Mar 2018 17:18:46 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201803071718.w27HIkLe030721@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 7 Mar 2018 17:18:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r330612 - head/stand/ficl
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/stand/ficl
X-SVN-Commit-Revision: 330612
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Mar 2018 17:18:47 -0000

Author: kevans
Date: Wed Mar  7 17:18:46 2018
New Revision: 330612
URL: https://svnweb.freebsd.org/changeset/base/330612

Log:
  stand/ficl: Fix testmain
  
  testmain is a userland application intended to be built with standard
  headers and whatnot, which we broke.
  
  Fix it by having the testmain build clobber cflags, reducing it to just the
  set of defines/includes it needs to build.
  
  Discussed with:	imp
  MFC after:	3 days

Modified:
  head/stand/ficl/Makefile

Modified: head/stand/ficl/Makefile
==============================================================================
--- head/stand/ficl/Makefile	Wed Mar  7 17:16:41 2018	(r330611)
+++ head/stand/ficl/Makefile	Wed Mar  7 17:18:46 2018	(r330612)
@@ -13,7 +13,8 @@ SRCS=		${BASE_SRCS} sysdep.c softcore.c
 CLEANFILES+=	softcore.c testmain testmain.o
 
 .ifmake testmain
-CFLAGS+=	-DTESTMAIN -D_TESTMAIN
+CFLAGS=	-DTESTMAIN -D_TESTMAIN
+CFLAGS+=	-I${FICLSRC} -I${FICLSRC}/${FICL_CPUARCH} -I${LDRSRC}
 SRCS+=		testmain.c
 PROG=		testmain
 .include <bsd.prog.mk>