diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-04-17 15:53:22 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-04-17 15:53:22 +0000 |
| commit | b9def0189fc9221a7d09ec42107ca30e7b53c424 (patch) | |
| tree | c10f7a1323a40f91fa8e8b1f1fc2fa3fafa59b08 /gnu/lib/Makefile | |
| parent | 8faa79c5c2c2a36de7af6bdbb76da3392e7c51c7 (diff) | |
Change build infrastructure to allow building both gcc and clang. This
doesn't actually flip the switch yet, so aarch64 continues to be the only
architecture for which we build clang.
ok jsg@, deraadt@
Diffstat (limited to 'gnu/lib/Makefile')
| -rw-r--r-- | gnu/lib/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 8122d17a26b..6050bae902c 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2017/01/21 12:40:49 jsg Exp $ +# $OpenBSD: Makefile,v 1.21 2017/04/17 15:53:21 kettenis Exp $ .include <bsd.own.mk> @@ -6,9 +6,10 @@ SUBDIR+=libiberty libreadline .if make(obj) SUBDIR+=libobjc libstdc++ libstdc++-v3 libsupc++-v3 ../usr.bin/cc/libobjc .else -. if ${COMPILER_VERSION:L} == "gcc3" +. if ${BUILD_GCC3:L} == "yes" SUBDIR+=libobjc libstdc++ -. elif ${COMPILER_VERSION:L} == "gcc4" +. endif +. if ${BUILD_GCC4:L} == "yes" # XXX make sure we build libobjc & libstdc++-v3 from gcc4 SUBDIR+=../usr.bin/cc/libobjc SUBDIR+=libstdc++-v3 libsupc++-v3 |