From owner-cvs-src@FreeBSD.ORG Sun Jun 29 17:15:39 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E62537B401; Sun, 29 Jun 2003 17:15:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D39EF44017; Sun, 29 Jun 2003 17:15:38 -0700 (PDT) (envelope-from ru@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5U0Fc0U038629; Sun, 29 Jun 2003 17:15:38 -0700 (PDT) (envelope-from ru@repoman.freebsd.org) Received: (from ru@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5U0FclM038628; Sun, 29 Jun 2003 17:15:38 -0700 (PDT) Message-Id: <200306300015.h5U0FclM038628@repoman.freebsd.org> From: Ruslan Ermilov Date: Sun, 29 Jun 2003 17:15:38 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/boot/i386/kgzldr Makefile X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 00:15:39 -0000 ru 2003/06/29 17:15:38 PDT FreeBSD src repository Modified files: sys/boot/i386/kgzldr Makefile Log: Revision 1.13, besides its useful part, replaced bsd.prog.mk by bsd.lib.mk and thus broke the build since AFLAGS were not taken into considered anymore, as bsd.lib.mk currently has wrong .s.o rule that uses cc(1) instead of as(1). Revision 1.14 reverted to using as(1), and revision 1.15 brought AFLAGS back to the business, but revision 1.14 also broke "make clean". To fix this, but not break anything that was fixed in revisions 1.13-1.15, we revert mostly to revision 1.13 except for switching back to using bsd.prog.mk. This gives us back the default .s.o rule from sys.mk that uses as(1), and fixes "make clean" by restoring the full contents of OBJS. Also fixed LDFLAGS. Revision Changes Path 1.16 +4 -10 src/sys/boot/i386/kgzldr/Makefile