diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-10-15 19:55:17 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-10-15 19:55:17 +0200 |
| commit | 5bc1e0de36dd151ee44dd6588eb794027bd89a07 (patch) | |
| tree | 9d750e7cb2d1922e389640b5676a3597c809a635 | |
| parent | 6a8e8dae95b9fd74471bd3cef0b6d352426a2973 (diff) | |
| parent | 6f65b7c6ca13c1cee4b5f605d38978224c6edeb7 (diff) | |
Merge pull request #935 from SaberUK/insp20+fix-crlf
Add a workaround for compiling modules with Windows line endings.
| -rw-r--r-- | make/configure.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make/configure.pm b/make/configure.pm index f877846fc..9b8e2d0e4 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -81,7 +81,7 @@ sub getcompilerflags { my ($file) = @_; open(FLAGS, $file) or return ""; while (<FLAGS>) { - if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) { + if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/\r?$/) { my $x = translate_functions($1, $file); next if ($x eq ""); close(FLAGS); @@ -96,7 +96,7 @@ sub getlinkerflags { my ($file) = @_; open(FLAGS, $file) or return ""; while (<FLAGS>) { - if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) { + if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/\r?$/) { my $x = translate_functions($1, $file); next if ($x eq ""); close(FLAGS); @@ -111,7 +111,7 @@ sub getdependencies { my ($file) = @_; open(FLAGS, $file) or return ""; while (<FLAGS>) { - if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) { + if ($_ =~ /^\/\* \$ModDep: (.+) \*\/\r?$/) { my $x = translate_functions($1, $file); next if ($x eq ""); close(FLAGS); @@ -126,7 +126,7 @@ sub nopedantic { my ($file) = @_; open(FLAGS, $file) or return ""; while (<FLAGS>) { - if ($_ =~ /^\/\* \$NoPedantic \*\/$/) { + if ($_ =~ /^\/\* \$NoPedantic \*\/\r?$/) { my $x = translate_functions($_, $file); next if ($x eq ""); close(FLAGS); |