From: Joe Orton Date: Tue, 28 Sep 2004 13:09:37 +0000 (+0000) Subject: * support/apxs.in: Reset $opt so that -I, -D and -Wc,* options are not X-Git-Tag: 2.1.1~202 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70ed655fa86fc81a02d025e464bee7fbca09106b;p=thirdparty%2Fapache%2Fhttpd.git * support/apxs.in: Reset $opt so that -I, -D and -Wc,* options are not passed to the libtool link line. For "-Wl,-foo" pass "-foo" on the link line regardless of whether gcc is used; without guessing whether libtool --mode=link will invoke gcc or some native ld the previous behaviour is not really correct. PR: 31448 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105309 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/support/apxs.in b/support/apxs.in index 65ccdcdb1d0..ec880543d60 100644 --- a/support/apxs.in +++ b/support/apxs.in @@ -418,12 +418,9 @@ if ($opt_c) { $lo .= " $o"; } my ($opt_Wl, $opt_L, $opt_l); + $opt = ''; foreach $opt_Wl (@opt_W) { - if ($CFG_CC !~ m/gcc$/) { - $opt .= " $1" if ($opt_Wl =~ m|^\s*l,(.*)$|); - } else { - $opt .= " -W$opt_Wl"; - } + $opt .= "$1 " if ($opt_Wl =~ m|^\s*l,(.*)$|); } foreach $opt_L (@opt_L) { $opt .= " -L$opt_L";