--- a/support/apxs.in 2020-03-20 08:00:44.000000000 -0500 +++ b/support/apxs.in 2026-04-24 00:30:48.000000000 -0500 @@ -229,7 +229,7 @@ ? $config_vars{$arg} : $config_vars{lc $arg}; $val =~ s/[()]//g; - $result .= eval "qq($val)" if defined $val; + $result = eval "qq($val)" if defined $val; $result .= ";;"; $ok = 1; } @@ -237,7 +237,7 @@ if (exists $internal_vars{$arg} or exists $internal_vars{lc $arg}) { my $val = exists $internal_vars{$arg} ? $arg : lc $arg; $val = eval "\$CFG_$val"; - $result .= eval "qq($val)" if defined $val; + $result = eval "qq($val)" if defined $val; $result .= ";;"; $ok = 1; } @@ -438,7 +438,7 @@ $la =~ s|\.c$|.la|; my $o = $s; $o =~ s|\.c$|.o|; - push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo"); + push(@cmds, "$libtool $ltflags --mode=compile --tag=CC $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo"); unshift(@objs, $lo); } @@ -479,7 +479,7 @@ $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags"; } - push(@cmds, "$libtool $ltflags --mode=link $CFG_CC $ldflags -o $dso_file $opt $lo"); + push(@cmds, "$libtool $ltflags --mode=link --tag=CC $CFG_CC $ldflags -o $dso_file $opt $lo"); # execute the commands &execute_cmds(@cmds);