- honor CC/CFLAGS

ok form@ (MAINTAINER)
This commit is contained in:
jasper 2010-11-07 19:06:15 +00:00
parent ed9bedcd46
commit 6526c60db5
2 changed files with 9 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2010/11/07 18:29:54 jasper Exp $
# $OpenBSD: Makefile,v 1.5 2010/11/07 19:06:15 jasper Exp $
# $RuOBSD: Makefile,v 1.4 2009/02/07 10:28:55 form Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= thorough, stand alone memory test
VERSION= 4.10
DISTNAME= memtest86+-${VERSION}
REVISION= 0
REVISION= 1
CATEGORIES= sysutils
HOMEPAGE= http://www.memtest.org/

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.3 2010/05/31 07:35:55 form Exp $
$OpenBSD: patch-Makefile,v 1.4 2010/11/07 19:06:15 jasper Exp $
$RuOBSD: patch-Makefile,v 1.3 2009/02/07 10:28:03 form Exp $
--- Makefile.orig Wed Apr 28 19:11:15 2010
+++ Makefile Mon May 31 04:08:48 2010
--- Makefile.orig Wed Apr 28 14:11:15 2010
+++ Makefile Sun Nov 7 19:30:26 2010
@@ -6,33 +6,47 @@
#
# Path for the floppy disk device
@ -10,9 +10,11 @@ $RuOBSD: patch-Makefile,v 1.3 2009/02/07 10:28:03 form Exp $
+FDISK=/dev/fd0c
AS=as -32
CC=gcc
-CC=gcc
+CC?=gcc
CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
+CFLAGS+= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
+OBJS= head.o reloc.o main.o test.o init.o patn.o screen_buffer.o \