Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | Upstream-Status:Inappropriate [embedded specific] |
| 2 | |
| 3 | The upstream code assumes that the compiler version used to compiler miniperl/perl-native |
| 4 | is the same as the one being used to build the perl binary. Since most people are not running |
| 5 | systems with gcc 5, it is unlikely that it will work on any supported host. Switch out gccversion |
| 6 | for the version extracted from $CC --version. |
| 7 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 8 | Jeremy Puhlman <jpuhlman@mvista.com> |
| 9 | |
| 10 | Fix spaces in brackets while running $CC --version |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 12 | --- |
| 13 | ext/Errno/Errno_pm.PL | 6 +++++- |
| 14 | 1 file changed, 5 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL |
| 17 | index 1fd29d0..7976ea2 100644 |
| 18 | --- a/ext/Errno/Errno_pm.PL |
| 19 | +++ b/ext/Errno/Errno_pm.PL |
| 20 | @@ -224,9 +224,13 @@ sub write_errno_pm { |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 21 | |
| 22 | { # BeOS (support now removed) did not enter this block |
| 23 | # invoke CPP and read the output |
| 24 | + my $compiler = $ENV{'CC'}; |
| 25 | + my $compiler_out = `$compiler --version`; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 26 | + $compiler_out =~ s/\(.*\)/;/; |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 27 | + my @compiler_version = split / /,$compiler_out; |
| 28 | |
| 29 | my $inhibit_linemarkers = ''; |
| 30 | - if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) { |
| 31 | + if (@compiler_version[2] =~ /\A(\d+)\./ and $1 >= 5) { |
| 32 | # GCC 5.0 interleaves expanded macros with line numbers breaking |
| 33 | # each line into multiple lines. RT#123784 |
| 34 | $inhibit_linemarkers = ' -P'; |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 35 | -- |
| 36 | 1.9.1 |
| 37 | |