From f1311538ce6d599f93e18a7b1e2285b9b2dae8d2 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Fri, 10 Nov 2023 17:13:00 +0100 Subject: [PATCH] libgcc/whole-archive cleanup * remove unnecessary 'whole-archive' entries from qmake.tcl and cmake.tcl * remove unnecessary and unused globals of 'ldlibs_so' issue #68 --- share/goa/lib/build/autoconf.tcl | 4 ++-- share/goa/lib/build/cargo.tcl | 2 +- share/goa/lib/build/cmake.tcl | 3 --- share/goa/lib/build/make.tcl | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/share/goa/lib/build/autoconf.tcl b/share/goa/lib/build/autoconf.tcl index 83ab80b..00c361f 100644 --- a/share/goa/lib/build/autoconf.tcl +++ b/share/goa/lib/build/autoconf.tcl @@ -4,7 +4,7 @@ proc create_or_update_build_dir { } { mirror_source_dir_to_build_dir global build_dir cross_dev_prefix project_name project_dir - global cppflags cflags cxxflags ldflags ldlibs_common ldlibs_exe ldlibs_so + global cppflags cflags cxxflags ldflags ldlibs_common ldlibs_exe # invoke configure script only once if {[file exists [file join $build_dir config.status]]} { @@ -74,7 +74,7 @@ proc create_or_update_build_dir { } { proc build { } { - global build_dir verbose project_name jobs project_dir ldlibs_common ldlibs_exe ldlibs_so + global build_dir verbose project_name jobs project_dir ldlibs_common ldlibs_exe set cmd { } diff --git a/share/goa/lib/build/cargo.tcl b/share/goa/lib/build/cargo.tcl index f4c2512..7c0c52b 100644 --- a/share/goa/lib/build/cargo.tcl +++ b/share/goa/lib/build/cargo.tcl @@ -24,7 +24,7 @@ proc generate_static_stubs { libs } { proc build { } { global build_dir cross_dev_prefix verbose debug project_name jobs project_dir - global cppflags cflags cxxflags ldflags ldlibs_common ldlibs_exe ldlibs_so lib_src + global cppflags cflags cxxflags ldflags ldlibs_common ldlibs_exe lib_src global cc_march set rustflags { } diff --git a/share/goa/lib/build/cmake.tcl b/share/goa/lib/build/cmake.tcl index 62b0331..0352f99 100644 --- a/share/goa/lib/build/cmake.tcl +++ b/share/goa/lib/build/cmake.tcl @@ -12,9 +12,6 @@ proc create_or_update_build_dir { } { set orig_pwd [pwd] cd $build_dir - lappend ldflags "-Wl,--whole-archive" - lappend ldlibs_common -Wl,--whole-archive -lgcc -Wl,--no-whole-archive - set ::env(LDFLAGS) "$ldflags $ldlibs_common $ldlibs_exe" set cmd { } diff --git a/share/goa/lib/build/make.tcl b/share/goa/lib/build/make.tcl index a9ae3a0..db7458d 100644 --- a/share/goa/lib/build/make.tcl +++ b/share/goa/lib/build/make.tcl @@ -1,6 +1,6 @@ proc _make_cmd { } { global build_dir cross_dev_prefix verbose jobs project_dir - global cppflags cflags cxxflags ldflags ldlibs_common ldlibs_exe ldlibs_so lib_src + global cppflags cflags cxxflags ldflags ldlibs_common ldlibs_exe lib_src set cmd { }