summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Fiddaman <omnios@citrus-it.co.uk>2019-02-26 14:47:55 +0000
committerAndy Fiddaman <omnios@citrus-it.co.uk>2019-03-01 10:09:12 +0000
commit6d3b6de806befb1050c80e5d4be2214ee68fb2b7 (patch)
treec38e638160c8aca96420446ae25037f4d33c03b4
parent18ce2efc2fad1ecfa25d6faac23d49fb479d2f00 (diff)
downloadillumos-joyent-6d3b6de806befb1050c80e5d4be2214ee68fb2b7.tar.gz
10462 nightly errors - libmakestate.so.1: open failed
Reviewed by: Gergő Mihály Doma <domag02@gmail.com> Reviewed by: Jason King <jason.king@joyent.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/Makefile13
1 files changed, 12 insertions, 1 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index bdd702f339..45e24f49a2 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.
#