Skip to content

Commit

Permalink
build/autoconf: use gaol
Browse files Browse the repository at this point in the history
  • Loading branch information
jschlatow committed Oct 1, 2024
1 parent 62c6f48 commit 3faa39c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions share/goa/lib/build/autoconf.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ proc create_or_update_build_dir { } {

mirror_source_dir_to_build_dir

global gaol
global cppflags cflags cxxflags ldflags ldlibs_common ldlibs_exe
global config::build_dir config::cross_dev_prefix config::project_name
global config::project_dir
Expand All @@ -19,12 +20,11 @@ proc create_or_update_build_dir { } {
#
if {[expr ![file exists [file join src configure]]]} {

set cmd { }

set cmd [goa::sandboxed_build_command]
lappend cmd "autoreconf"
lappend cmd "--install"

diag "create build system via command:" {*}$cmd
diag "create build system via autoreconf"

cd $build_dir
if {[catch {exec -ignorestderr {*}$cmd | sed "s/^/\[$project_name:autoconf\] /" >@ stdout} msg]} {
Expand All @@ -33,7 +33,7 @@ proc create_or_update_build_dir { } {
cd $orig_pwd
}

set cmd { }
set cmd [goa::sandboxed_build_command]

lappend cmd "./configure"
lappend cmd "--prefix" "/"
Expand Down Expand Up @@ -62,7 +62,7 @@ proc create_or_update_build_dir { } {
foreach arg [read_file_content_as_list [file join $project_dir configure_args]] {
lappend cmd $arg }

diag "create build directory via command:" {*}$cmd
diag "create build directory via autoconf"

cd $build_dir

Expand All @@ -78,7 +78,7 @@ proc build { } {
global verbose ldlibs_common ldlibs_exe
global config::build_dir config::project_name config::jobs config::project_dir

set cmd { }
set cmd [goa::sandboxed_build_command]

# pass variables that are not fully handled by configure scripts
lappend cmd make -C $build_dir
Expand All @@ -102,7 +102,7 @@ proc build { } {
foreach arg [read_file_content_as_list [file join $project_dir make_args]] {
lappend cmd $arg }

diag "build via command" {*}$cmd
diag "build via make"

if {[catch {exec -ignorestderr {*}$cmd | sed "s/^/\[$project_name:make\] /" >@ stdout}]} {
exit_with_error "build via make failed" }
Expand Down

0 comments on commit 3faa39c

Please sign in to comment.