From 3faa39c4f2b4e493356f10368a83be3302497330 Mon Sep 17 00:00:00 2001 From: Johannes Schlatow Date: Mon, 23 Sep 2024 09:09:23 +0200 Subject: [PATCH] build/autoconf: use gaol genodelabs/goa#99 --- share/goa/lib/build/autoconf.tcl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/goa/lib/build/autoconf.tcl b/share/goa/lib/build/autoconf.tcl index b9f7bcd..6ccb688 100644 --- a/share/goa/lib/build/autoconf.tcl +++ b/share/goa/lib/build/autoconf.tcl @@ -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 @@ -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]} { @@ -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" "/" @@ -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 @@ -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 @@ -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" }