diff options
author | marcel <marcel@FreeBSD.org> | 2012-10-06 20:01:05 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2012-10-06 20:01:05 +0000 |
commit | 52e7fd7c5436658853af57ebcba4109961c9126c (patch) | |
tree | 70de730ba0fbf9e81dd585c1575a057d03a31be8 /lib/clang/include | |
parent | b84b597f7acedbe94a9dac4963137a33677e7e19 (diff) | |
download | FreeBSD-src-52e7fd7c5436658853af57ebcba4109961c9126c.zip FreeBSD-src-52e7fd7c5436658853af57ebcba4109961c9126c.tar.gz |
Add support for bmake. This includes:
1. Don't do upgrade_checks when using bmake. As long as we have WITH_BMAKE,
there's a bootstrap complication in ths respect. Avoid it. Make the
necessary changes to have upgrade_checks work wth bmake anyway.
2. Remove the use of -E. It's not needed in our build because we use ?= for
the respective variables, which means that we'll take the environment
value (if any) anyway.
3. Properly declare phony targets as phony as bmake is a lot smarter (and
thus agressive) about build avoidance.
4. Make sure CLEANFILES is complete and use it on .NOPATH. bmake is a lot
smarter about build avoidance and should not find files we generate in
the source tree. We should not have files in the repository we want to
generate, but this is an easier way to cross this hurdle.
5. Have behavior under bmake the same as it is under make with respect to
halting when sub-commands fail. Add "set -e" to compound commands so
that bmake is informed when sub-commands fail.
6. Make sure crunchgen uses the same make as the rest of the build. This
is important when the make utility isn't called make (but bmake for
example).
7. While here, add support for using MAKEOBJDIR to set the object tree
location. It's the second alternative bmake looks for when determining
the actual object directory (= .OBJDIR).
Submitted by: Simon Gerraty <sjg@juniper.net>
Submitted by: John Van Horne <jvanhorne@juniper.net>
Diffstat (limited to 'lib/clang/include')
-rw-r--r-- | lib/clang/include/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile index 9b2670a..93d91c7 100644 --- a/lib/clang/include/Makefile +++ b/lib/clang/include/Makefile @@ -30,6 +30,4 @@ INCS= altivec.h \ xmmintrin.h \ xopintrin.h -.include <bsd.init.mk> -.include <bsd.incs.mk> -.include <bsd.obj.mk> +.include <bsd.prog.mk> |