diff options
author | Stefan Fritsch <sf@apache.org> | 2012-05-27 20:39:14 +0000 |
---|---|---|
committer | Stefan Fritsch <sf@apache.org> | 2012-05-27 20:39:14 +0000 |
commit | 49efa827aa3bbb9cab7c9eb62dcd0916e441f447 (patch) | |
tree | 6422a4004a24b8571092026382849a24df8ed0ef /support/apxs.in | |
parent | be276306572185e2be21e2d65f62eabaaeff505b (diff) | |
download | httpd-49efa827aa3bbb9cab7c9eb62dcd0916e441f447.tar.gz |
Make apxs use LDFLAGS from config_vars.mk in addition to CFLAGS and CPPFLAGS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1343094 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/apxs.in')
-rw-r--r-- | support/apxs.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/support/apxs.in b/support/apxs.in index 39ff16cd3c..8bdc2daca0 100644 --- a/support/apxs.in +++ b/support/apxs.in @@ -39,6 +39,8 @@ my $CFG_TARGET = get_vars("progname"); my $CFG_SYSCONFDIR = get_vars("sysconfdir"); my $CFG_CFLAGS = join ' ', map { get_vars($_) } qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS); +my $CFG_LDFLAGS = join ' ', map { get_vars($_) } + qw(LDFLAGS NOTEST_LDFLAGS SH_LDFLAGS); my $includedir = get_vars("includedir"); my $CFG_INCLUDEDIR = eval qq("$includedir"); my $CFG_CC = get_vars("CC"); @@ -448,6 +450,7 @@ if ($opt_c) { $opt .= " -l$opt_l"; } + my $ldflags = "$CFG_LDFLAGS"; if ($opt_p == 1) { my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`; @@ -466,7 +469,7 @@ if ($opt_c) { $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags"; } - push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo"); + push(@cmds, "$libtool $ltflags --mode=link $CFG_CC $ldflags -o $dso_file $opt $lo"); # execute the commands &execute_cmds(@cmds); |