Merge pull request #2617 from martin-frbg/issue2616
Add workaround for unhandled gmake jobserver flags in c_check/f_check
This commit is contained in:
commit
cf46c9f84e
1
c_check
1
c_check
|
@ -310,6 +310,7 @@ $linker_a = "";
|
||||||
&& ($flags !~ /advapi32/)
|
&& ($flags !~ /advapi32/)
|
||||||
&& ($flags !~ /shell32/)
|
&& ($flags !~ /shell32/)
|
||||||
&& ($flags !~ /omp/)
|
&& ($flags !~ /omp/)
|
||||||
|
&& ($flags !~ /[0-9]+/)
|
||||||
) {
|
) {
|
||||||
$linker_l .= $flags . " "
|
$linker_l .= $flags . " "
|
||||||
}
|
}
|
||||||
|
|
1
f_check
1
f_check
|
@ -335,6 +335,7 @@ if ($link ne "") {
|
||||||
&& ($flags !~ /advapi32/)
|
&& ($flags !~ /advapi32/)
|
||||||
&& ($flags !~ /shell32/)
|
&& ($flags !~ /shell32/)
|
||||||
&& ($flags !~ /omp/)
|
&& ($flags !~ /omp/)
|
||||||
|
&& ($flags !~ /[0-9]+/)
|
||||||
&& ($flags !~ /^\-l$/)
|
&& ($flags !~ /^\-l$/)
|
||||||
) {
|
) {
|
||||||
$linker_l .= $flags . " ";
|
$linker_l .= $flags . " ";
|
||||||
|
|
Loading…
Reference in New Issue