Merge pull request #3223 from martin-frbg/develop

Use percent instead of ampersand as placeholder for substitutions
This commit is contained in:
Martin Kroeker 2021-05-07 08:51:45 +02:00 committed by GitHub
commit c90c23e78f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions

14
f_check
View File

@ -314,11 +314,11 @@ if ($link ne "") {
$link =~ s/\-Y\sP\,/\-Y/g; $link =~ s/\-Y\sP\,/\-Y/g;
$link =~ s/\-R\s*/\-rpath\@/g; $link =~ s/\-R\s*/\-rpath\%/g;
$link =~ s/\-rpath\s+/\-rpath\@/g; $link =~ s/\-rpath\s+/\-rpath\%/g;
$link =~ s/\-rpath-link\s+/\-rpath-link\@/g; $link =~ s/\-rpath-link\s+/\-rpath-link\%/g;
@flags = split(/[\s\,\n]/, $link); @flags = split(/[\s\,\n]/, $link);
# remove leading and trailing quotes from each flag. # remove leading and trailing quotes from each flag.
@ -344,13 +344,13 @@ if ($link ne "") {
} }
if ($flags =~ /^\-rpath\@/) { if ($flags =~ /^\-rpath\%/) {
$flags =~ s/\@/\,/g; $flags =~ s/\%/\,/g;
$linker_L .= "-Wl,". $flags . " " ; $linker_L .= "-Wl,". $flags . " " ;
} }
if ($flags =~ /^\-rpath-link\@/) { if ($flags =~ /^\-rpath-link\%/) {
$flags =~ s/\@/\,/g; $flags =~ s/\%/\,/g;
$linker_L .= "-Wl,". $flags . " " ; $linker_L .= "-Wl,". $flags . " " ;
} }
if ($flags =~ /-lgomp/ && $ENV{"CC"} =~ /clang/) { if ($flags =~ /-lgomp/ && $ENV{"CC"} =~ /clang/) {