diff options
| author | Yuri Pankov <ypankov@tintri.com> | 2022-09-25 05:29:34 +0200 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-10-10 09:41:04 -0400 |
| commit | 3c6ef809288edc29a5dd9e0664c095967e7903dc (patch) | |
| tree | a764014ab9930f47ebb4f16d8cd37938dae3c41c /usr | |
| parent | d687f445dcb8e0cd6caf81ea59a259f83ac93e2d (diff) | |
| download | illumos-gate-3c6ef809288edc29a5dd9e0664c095967e7903dc.tar.gz | |
13313 tools build uses cw from /opt/onbld even if -t flag is specified
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@mnx.io>
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/src/tools/scripts/nightly | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/tools/scripts/nightly b/usr/src/tools/scripts/nightly index 72bc1f2c3e..dc9bbce8d2 100755 --- a/usr/src/tools/scripts/nightly +++ b/usr/src/tools/scripts/nightly @@ -23,7 +23,7 @@ # # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2008, 2010, Richard Lowe -# Copyright 2011 Nexenta Systems, Inc. All rights reserved. +# Copyright 2022 Tintri by DDN, Inc. All rights reserved. # Copyright 2012 Joshua M. Clulow <josh@sysmgr.org> # Copyright (c) 2017 by Delphix. All rights reserved. # Copyright 2020 Joyent, Inc. @@ -1550,12 +1550,12 @@ fi if [[ "$t_FLAG" == "y" ]]; then set_non_debug_build_flags - bootstrap_tools || fatal_error "Error: could not bootstrap tools" - # Switch ONBLD_TOOLS early if -t is specified so that # we could use bootstrapped cw for compiler checks. ONBLD_TOOLS=${TOOLS_PROTO}/opt/onbld export ONBLD_TOOLS + + bootstrap_tools || fatal_error "Error: could not bootstrap tools" fi echo "\n==== Build environment ====\n" | tee -a $build_environ_file >> $LOGFILE |