summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2014-10-13 21:44:13 +0100
committerPeter Powell <petpow@saberuk.com>2014-10-13 22:04:47 +0100
commit6f65b7c6ca13c1cee4b5f605d38978224c6edeb7 (patch)
treeefd5b63bdddc6ef569a577a4b4c563c50f029d7f
parentc8d3cce3a701f9f7786c5efecb457850d89edf6d (diff)
Add a workaround for compiling modules with Windows line endings.
-rw-r--r--make/configure.pm8
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);