Update 1.1.1-pre8
This commit is contained in:
@@ -125,6 +125,7 @@ my $gcc_devteam_warn = "-DDEBUG_UNUSED"
|
||||
. " -Wswitch"
|
||||
. " -Wsign-compare"
|
||||
. " -Wmissing-prototypes"
|
||||
. " -Wstrict-prototypes"
|
||||
. " -Wshadow"
|
||||
. " -Wformat"
|
||||
. " -Wtype-limits"
|
||||
@@ -822,11 +823,7 @@ while (@argvcopy)
|
||||
{
|
||||
read_config $1;
|
||||
}
|
||||
elsif (/^-L(.*)$/)
|
||||
{
|
||||
push @{$useradd{LDFLAGS}}, $_;
|
||||
}
|
||||
elsif (/^-l(.*)$/ or /^-Wl,/)
|
||||
elsif (/^-l(.*)$/)
|
||||
{
|
||||
push @{$useradd{LDLIBS}}, $_;
|
||||
}
|
||||
@@ -834,6 +831,10 @@ while (@argvcopy)
|
||||
{
|
||||
push @{$useradd{LDLIBS}}, $_, shift(@argvcopy);
|
||||
}
|
||||
elsif (/^-L(.*)$/ or /^-Wl,/)
|
||||
{
|
||||
push @{$useradd{LDFLAGS}}, $_;
|
||||
}
|
||||
elsif (/^-rpath$/ or /^-R$/)
|
||||
# -rpath is the OSF1 rpath flag
|
||||
# -R is the old Solaris rpath flag
|
||||
@@ -953,7 +954,7 @@ foreach (keys %user) {
|
||||
}
|
||||
}
|
||||
|
||||
if (grep { $_ =~ /(^|\s)-Wl,-rpath,/ } ($user{LDLIBS} ? @{$user{LDLIBS}} : ())
|
||||
if (grep { /-rpath\b/ } ($user{LDFLAGS} ? @{$user{LDFLAGS}} : ())
|
||||
&& !$disabled{shared}
|
||||
&& !($disabled{asan} && $disabled{msan} && $disabled{ubsan})) {
|
||||
die "***** Cannot simultaneously use -rpath, shared libraries, and\n",
|
||||
@@ -1110,8 +1111,9 @@ $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
|
||||
$target{exe_extension}=".pm" if ($config{target} =~ /vos/);
|
||||
|
||||
($target{shared_extension_simple}=$target{shared_extension})
|
||||
=~ s|\.\$\(SHLIB_VERSION_NUMBER\)||;
|
||||
$target{dso_extension}=$target{shared_extension_simple};
|
||||
=~ s|\.\$\(SHLIB_VERSION_NUMBER\)||
|
||||
unless defined($target{shared_extension_simple});
|
||||
$target{dso_extension}//=$target{shared_extension_simple};
|
||||
($target{shared_import_extension}=$target{shared_extension_simple}.".a")
|
||||
if ($config{target} =~ /^(?:Cygwin|mingw)/);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user