summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-11-04 13:20:58 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-11-04 13:20:58 +0000
commit86198cadbfebe5ec109f67cf93169fa825fae9a3 (patch)
treef781c736ed0cbe5dea821e2428313a9520e89518
parent63e0bb54084bafb7f85c656131bff21559b7300b (diff)
better GLOBAL_AUTCONF_CACHE
-rw-r--r--gnu/usr.bin/gcc/Makefile.bsd-wrapper30
1 files changed, 9 insertions, 21 deletions
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index e03809276b7..4c1daa6a0a3 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.29 1997/08/01 20:13:58 pefo Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.30 1997/11/04 13:20:57 kstailey Exp $
MAN= cccp.1 gcc.1 cp/g++.1 f/g77.1
MLINKS+= gcc.1 cc.1
@@ -30,37 +30,25 @@ all: config.status
.include <bsd.own.mk>
.ifdef GLOBAL_AUTOCONF_CACHE
-config: .FORCE
- -rm -f config.cache
- INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
- /bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
- --prefix=/usr --local-prefix=/usr \
- --gxx-include=${GPP_INC_DIR} \
- --cache-file=${GLOBAL_AUTOCONF_CACHE} \
- ${GCCARCH}
-config.status: Makefile.in configure c-parse.in
- INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
- /bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
- --prefix=/usr --local-prefix=/usr \
- --gxx-include=${GPP_INC_DIR} \
- --cache-file=${GLOBAL_AUTOCONF_CACHE} \
- ${GCCARCH} && touch config.status
+CF= --cache-file=${GLOBAL_AUTOCONF_CACHE}
.else
+CF=
+.endif
+
config: .FORCE
+.ifndef GLOBAL_AUTOCONF_CACHE
-rm -f config.cache
+.endif
INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
/bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
- --prefix=/usr --local-prefix=/usr \
+ --prefix=/usr --local-prefix=/usr ${CF} \
--gxx-include=${GPP_INC_DIR} ${GCCARCH}
config.status: Makefile.in configure c-parse.in
INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
/bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
- --prefix=/usr --local-prefix=/usr \
+ --prefix=/usr --local-prefix=/usr ${CF} \
--gxx-include=${GPP_INC_DIR} ${GCCARCH} && touch config.status
-.endif
-
-.include <bsd.own.mk>
.ifdef NOMAN
maninstall: