<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/3ac0da62a9c648f5963c329e9f049f63af7b2369">https://github.com/macports/macports-base/commit/3ac0da62a9c648f5963c329e9f049f63af7b2369</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3ac0da62a9c648f5963c329e9f049f63af7b2369
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Dec 18 21:29:36 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> Move build.cmd check to build_main
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build_start proc gets run even if a blank build phase is defined.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68935
</span>---
src/port1.0/portbuild.tcl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portbuild.tcl b/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f4385601..8af745b60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,16 +198,16 @@ proc portbuild::build_getjobsarg {args} {
</span> proc portbuild::build_start {args} {
global UI_PREFIX build.cmd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build.cmd} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "No build command found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ui_notice "$UI_PREFIX [format [msgcat::mc "Building %s"] [option subport]]"
}
proc portbuild::build_main {args} {
global build.cmd build.jobs_arg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build.cmd} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "No build command found"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set realcmd ${build.cmd}
append build.cmd ${build.jobs_arg}
command_exec -callback portprogress::target_progress_callback build
</pre><pre style='margin:0'>
</pre>