Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix finding the correct cplusplus compiler #23146

Open
wants to merge 3 commits into
base: blead
Choose a base branch
from
Open

Fix finding the correct cplusplus compiler #23146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be0e4ae
Fix finding the correct cplusplus compiler
bingos Mar 21, 2025
5cda3c1
Added clang/clang++ to the C->C++ compiler mappings
bingos Mar 21, 2025
a9cee21
Remove literal tabs
bingos Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use Perl::OSType qw/os_type/;

use warnings;
use strict;
our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA;

# We only use this once - don't waste a symbol table entry on it.
Expand Down
36 changes: 22 additions & 14 deletions dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use Text::ParseWords;
use IPC::Cmd qw(can_run);
use File::Temp qw(tempfile);

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION

# More details about C/C++ compilers:
# http://developers.sun.com/sunstudio/documentation/product/compiler.jsp
Expand All @@ -24,6 +24,7 @@ my %cc2cxx = (
xlc => [ 'xlC' ], # IBM C/C++ Set, xlc without thread-safety
xlc_r => [ 'xlC_r' ], # IBM C/C++ Set, xlc with thread-safety
cl => [ 'cl' ], # Microsoft Visual Studio
clang => [ 'clang++' ], # LLVM compiler frontend
);

sub new {
Expand Down Expand Up @@ -51,24 +52,31 @@ sub new {

## If the path is just "cc", fileparse returns $ccpath as "./"
$ccpath = "" if $self->{config}{cc} =~ /^\Q$ccbase$ccsfx\E$/;

foreach my $cxx (@{$cc2cxx{$ccbase}}) {
my $cxx1 = File::Spec->catfile( $ccpath, $cxx . $ccsfx);

if( can_run( $cxx1 ) ) {
$self->{config}{cxx} = $cxx1;
last;
}
my $cxx2 = $cxx . $ccsfx;
if ( $ccpath ) {
my $cxx1 = File::Spec->catfile( $ccpath, $cxx . $ccsfx);

if( can_run( $cxx1 ) ) {
$self->{config}{cxx} = $cxx1;
last;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation here doesn't match the rest of the file, and has added literal tabs mixed with the spaces.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't actually change that from the original, the literal tab was there before. But let me fix that.


if( can_run( $cxx2 ) ) {
$self->{config}{cxx} = $cxx2;
last;
}
else {
my $cxx2 = $cxx . $ccsfx;

if( can_run( $cxx2 ) ) {
$self->{config}{cxx} = $cxx2;
last;
}

if( can_run( $cxx ) ) {
$self->{config}{cxx} = $cxx;
last;
}

if( can_run( $cxx ) ) {
$self->{config}{cxx} = $cxx;
last;
}
}
unless ( exists $self->{config}{cxx} ) {
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Unix.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use warnings;
use strict;
use ExtUtils::CBuilder::Base;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Base);

sub link_executable {
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/VMS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use warnings;
use strict;
use ExtUtils::CBuilder::Base;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Base);

use File::Spec::Functions qw(catfile catdir);
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use File::Spec;
use ExtUtils::CBuilder::Base;
use IO::File;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Base);

=begin comment
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ExtUtils::CBuilder::Platform::Windows::BCC;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ExtUtils::CBuilder::Platform::Windows::GCC;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION

use warnings;
use strict;
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ExtUtils::CBuilder::Platform::Windows::MSVC;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION

use warnings;
use strict;
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/aix.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use strict;
use ExtUtils::CBuilder::Platform::Unix;
use File::Spec;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

sub need_prelink { 1 }
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/android.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use File::Spec;
use ExtUtils::CBuilder::Platform::Unix;
use Config;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

# The Android linker will not recognize symbols from
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/cygwin.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use strict;
use File::Spec;
use ExtUtils::CBuilder::Platform::Unix;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

# TODO: If a specific exe_file name is requested, if the exe created
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/darwin.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use strict;
use ExtUtils::CBuilder::Platform::Unix;
use Config;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

my ($osver) = split /\./, $Config{osvers};
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use strict;
use ExtUtils::CBuilder::Platform::Unix;
use File::Spec;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

sub link_executable {
Expand Down
2 changes: 1 addition & 1 deletion dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Platform/os2.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use warnings;
use strict;
use ExtUtils::CBuilder::Platform::Unix;

our $VERSION = '0.280240'; # VERSION
our $VERSION = '0.280241'; # VERSION
our @ISA = qw(ExtUtils::CBuilder::Platform::Unix);

sub need_prelink { 1 }
Expand Down
Loading