diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-06-15 01:10:19 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-06-15 01:10:19 +0000 |
| commit | 71f62328bac44631736579550fca900c8ceeb8a4 (patch) | |
| tree | 0bd99b9119cad91f5ca923dfb68a84fcca89d895 | |
| parent | sync (diff) | |
| download | wireguard-openbsd-71f62328bac44631736579550fca900c8ceeb8a4.tar.xz wireguard-openbsd-71f62328bac44631736579550fca900c8ceeb8a4.zip | |
fix regress fallout due to CFLAGS vs CXXFLAGS
| -rw-r--r-- | regress/libexec/ld.so/dlopen/prog1/Makefile | 3 | ||||
| -rw-r--r-- | regress/libexec/ld.so/dlopen/prog2/Makefile | 4 | ||||
| -rw-r--r-- | regress/libexec/ld.so/dlopen/prog3/Makefile | 3 | ||||
| -rw-r--r-- | regress/libexec/ld.so/dlopen/prog4/Makefile | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/regress/libexec/ld.so/dlopen/prog1/Makefile b/regress/libexec/ld.so/dlopen/prog1/Makefile index 89680119a74..f9820d0294a 100644 --- a/regress/libexec/ld.so/dlopen/prog1/Makefile +++ b/regress/libexec/ld.so/dlopen/prog1/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2005/09/17 02:58:54 drahn Exp $ +# $OpenBSD: Makefile,v 1.4 2015/06/15 01:10:19 deraadt Exp $ .include <bsd.obj.mk> @@ -22,7 +22,6 @@ AB_OBJDIR!= if [ -d $(AB_DIR)/${__objdir} ]; then \ -CFLAGS=-I${.CURDIR}/../libab CFLAGS+=-g LDADD= #LDADD+=-lab diff --git a/regress/libexec/ld.so/dlopen/prog2/Makefile b/regress/libexec/ld.so/dlopen/prog2/Makefile index 85f89a337a0..dd5dd6ee6ba 100644 --- a/regress/libexec/ld.so/dlopen/prog2/Makefile +++ b/regress/libexec/ld.so/dlopen/prog2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2005/09/13 20:51:39 drahn Exp $ +# $OpenBSD: Makefile,v 1.2 2015/06/15 01:10:19 deraadt Exp $ .include <bsd.obj.mk> @@ -22,7 +22,7 @@ AB_OBJDIR!= if [ -d $(AB_DIR)/${__objdir} ]; then \ -CFLAGS=-I${.CURDIR}/../libab +CXXFLAGS=-I${.CURDIR}/../libab LDADD= LDADD+=-laa LDADD+=-lab diff --git a/regress/libexec/ld.so/dlopen/prog3/Makefile b/regress/libexec/ld.so/dlopen/prog3/Makefile index be8d9d8bf63..277dfaa90a5 100644 --- a/regress/libexec/ld.so/dlopen/prog3/Makefile +++ b/regress/libexec/ld.so/dlopen/prog3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2005/09/21 18:01:28 drahn Exp $ +# $OpenBSD: Makefile,v 1.3 2015/06/15 01:10:19 deraadt Exp $ .include <bsd.obj.mk> @@ -22,7 +22,6 @@ AC_OBJDIR!= if [ -d $(AC_DIR)/${__objdir} ]; then \ -CFLAGS=-I${.CURDIR}/../libac LDADD= #LDADD+=-laa #LDADD+=-lac diff --git a/regress/libexec/ld.so/dlopen/prog4/Makefile b/regress/libexec/ld.so/dlopen/prog4/Makefile index b145a9440f5..b23cdc30f01 100644 --- a/regress/libexec/ld.so/dlopen/prog4/Makefile +++ b/regress/libexec/ld.so/dlopen/prog4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2005/09/21 18:02:44 drahn Exp $ +# $OpenBSD: Makefile,v 1.3 2015/06/15 01:10:19 deraadt Exp $ .include <bsd.obj.mk> @@ -22,7 +22,6 @@ AC_OBJDIR!= if [ -d $(AC_DIR)/${__objdir} ]; then \ -CFLAGS=-I${.CURDIR}/../libac LDADD= #LDADD+=-laa #LDADD+=-lac |