summaryrefslogtreecommitdiff
path: root/usr/src/Makefile
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-03-01 12:46:03 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-03-01 12:46:03 +0000
commit8548fe460ce8a7976986f7006b67e9e8414b4ab5 (patch)
treed9791b18529a8330eda2c8cba973a894bf346972 /usr/src/Makefile
parent422ca0551d119315cb50c98e8f94d2c0a5f435e8 (diff)
parent6d3b6de806befb1050c80e5d4be2214ee68fb2b7 (diff)
downloadillumos-joyent-8548fe460ce8a7976986f7006b67e9e8414b4ab5.tar.gz
[illumos-gate merge]
commit 6d3b6de806befb1050c80e5d4be2214ee68fb2b7 10462 nightly errors - libmakestate.so.1: open failed commit 18ce2efc2fad1ecfa25d6faac23d49fb479d2f00 10386 pbchk should catch capitalised "illumos" 10387 pbchk should check commit message spelling
Diffstat (limited to 'usr/src/Makefile')
-rw-r--r--usr/src/Makefile13
1 files changed, 12 insertions, 1 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index e29a4c518a..47afb31733 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -193,8 +193,19 @@ sgs: rootdirs .WAIT sysheaders userheaders .WAIT \
#
setup: closedbins bldtools sgs mapfiles
+#
+# Always build tools as non-DEBUG.
+# When nightly launches a build it first builds non-DEBUG tools and then
+# configures the environment so that these tools are used for building
+# subsequently. If a recursive build from usr/src then builds DEBUG tools,
+# the tools will be rebuilt using themselves resulting in a race condition
+# that can cause the build to fail - see https://www.illumos.org/issues/10462
+# for more details.
+# A manual build in usr/src/tools in a DEBUG bldenv will still do a DEBUG
+# tools build.
+#
bldtools:
- @cd tools; pwd; $(MAKE) install
+ @cd tools; pwd; $(MAKE) RELEASE_BUILD= install
# /var/mail/:saved is a special case because of the colon in the name.
#