summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Krause <david@cvs.openbsd.org>2004-07-20 06:36:52 +0000
committerDavid Krause <david@cvs.openbsd.org>2004-07-20 06:36:52 +0000
commitec89179d0f2f06cbb0c7c7c9d6d9a4a4fec8460a (patch)
tree4e615fec6f024e092422984c0a898208984d2a04
parentb0d011d32e79d1859753afe56af71ab92eebbd18 (diff)
if USE_GCC3, look in the right place for the sources
-rw-r--r--regress/gnu/egcs/gcc/Makefile6
-rw-r--r--regress/gnu/egcs/libf2c/Makefile11
2 files changed, 13 insertions, 4 deletions
diff --git a/regress/gnu/egcs/gcc/Makefile b/regress/gnu/egcs/gcc/Makefile
index ffc15504f52..b46cee05995 100644
--- a/regress/gnu/egcs/gcc/Makefile
+++ b/regress/gnu/egcs/gcc/Makefile
@@ -1,9 +1,13 @@
-# $OpenBSD: Makefile,v 1.2 2004/07/09 21:56:32 david Exp $
+# $OpenBSD: Makefile,v 1.3 2004/07/20 06:36:51 david Exp $
NOMAN=
NOPROG=
+.if ${USE_GCC3:L:Myes}
+TESTDIR=${BSDSRCDIR}/gnu/usr.bin/gcc
+.else
TESTDIR=${BSDSRCDIR}/gnu/egcs/gcc
+.endif
regress:
@if ${RUNTEST} --help >/dev/null; then \
diff --git a/regress/gnu/egcs/libf2c/Makefile b/regress/gnu/egcs/libf2c/Makefile
index 975def73d66..59706d9434a 100644
--- a/regress/gnu/egcs/libf2c/Makefile
+++ b/regress/gnu/egcs/libf2c/Makefile
@@ -1,15 +1,20 @@
-# $OpenBSD: Makefile,v 1.2 2004/07/09 21:56:32 david Exp $
+# $OpenBSD: Makefile,v 1.3 2004/07/20 06:36:51 david Exp $
NOMAN=
NOPROG=
+.if ${USE_GCC3:L:Myes}
+TESTDIR=${BSDSRCDIR}/gnu/lib/libf2c
+TEST2DIR=${BSDSRCDIR}/gnu/usr.bin/gcc
+.else
TESTDIR=${BSDSRCDIR}/gnu/egcs/libf2c
TEST2DIR=${BSDSRCDIR}/gnu/egcs/gcc
+.endif
# We don't even try to run without objdir
-TEST3DIR=${BSDOBJDIR}/gnu/egcs/libf2c/libU77
-TEST4DIR=${BSDOBJDIR}/gnu/egcs/gcc/
+TEST3DIR=${TESTDIR}/libU77
+TEST4DIR=${TEST2DIR}/
regress: