This is an archive of the discontinued LLVM Phabricator instance.

Differential D111797

[clang][scan-build] Use uname -s to detect the operating system.
ClosedPublic

Authored by fcambus on Oct 14 2021, 5:41 AM.

Details

Reviewers
brad
Commits
rG6ecd4a4d01a3: [clang][scan-build] Use uname -s to detect the operating system.

Diff Detail

Event Timeline

fcambus requested review of this revision.Oct 14 2021, 5:41 AM
fcambus created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptOct 14 2021, 5:41 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B128838: Diff 379678.Oct 14 2021, 6:06 AM
brad added a comment.Oct 17 2021, 10:27 AM

I'm not a Perl guy but I'm wondering about simplifying what it is doing there to just uname -s eq 'OpenBSD'?

fcambus updated this revision to Diff 380263.Oct 17 2021, 12:42 PM

Avoid using regexps and use the 'eq' operator for doing string comparison.

fcambus added a comment.Oct 17 2021, 12:43 PM
In D111797#3069103, @brad wrote:

I'm not a Perl guy but I'm wondering about simplifying what it is doing there to just uname -s eq 'OpenBSD'?

Yes, I think it makes sense. Just sent an updated revision.

Harbormaster completed remote builds in B129252: Diff 380263.Oct 17 2021, 3:06 PM
brad added a comment.Oct 28 2021, 9:10 PM

Oh, and you would have to use chomp to eliminate the newline character. Never mind. That's kind of ugly. Maybe it is better to go back to the original diff.

fcambus updated this revision to Diff 383293.Oct 29 2021, 4:05 AM

Sure, I reverted to the previous revision.

Harbormaster completed remote builds in B131385: Diff 383293.Oct 29 2021, 4:25 AM
brad accepted this revision.Oct 30 2021, 12:54 PM
This revision is now accepted and ready to land.Oct 30 2021, 12:54 PM
This revision was landed with ongoing or failed builds.Oct 30 2021, 2:27 PM
Closed by commit rG6ecd4a4d01a3: [clang][scan-build] Use uname -s to detect the operating system. (authored by fcambus). · Explain Why
This revision was automatically updated to reflect the committed changes.
fcambus added a commit: rG6ecd4a4d01a3: [clang][scan-build] Use uname -s to detect the operating system..

Revision Contents

PathSize
clang/
tools/
scan-build/
libexec/
4 lines

Diff 379678

clang/tools/scan-build/libexec/ccc-analyzer

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Lines
my $DefaultCCompiler; my $DefaultCCompiler;
my $DefaultCXXCompiler; my $DefaultCXXCompiler;
my $IsCXX; my $IsCXX;
my $AnalyzerTarget; my $AnalyzerTarget;
# If on OSX, use xcrun to determine the SDK root. # If on OSX, use xcrun to determine the SDK root.
my $UseXCRUN = 0; my $UseXCRUN = 0;
if (`uname -a` =~ m/Darwin/) { if (`uname -s` =~ m/Darwin/) {
$DefaultCCompiler = 'clang'; $DefaultCCompiler = 'clang';
$DefaultCXXCompiler = 'clang++'; $DefaultCXXCompiler = 'clang++';
# Older versions of OSX do not have xcrun to # Older versions of OSX do not have xcrun to
# query the SDK location. # query the SDK location.
if (-x "/usr/bin/xcrun") { if (-x "/usr/bin/xcrun") {
$UseXCRUN = 1; $UseXCRUN = 1;
} }
} elsif (`uname -a` =~ m/OpenBSD/) { } elsif (`uname -s` =~ m/OpenBSD/) {
$DefaultCCompiler = 'cc'; $DefaultCCompiler = 'cc';
$DefaultCXXCompiler = 'c++'; $DefaultCXXCompiler = 'c++';
} else { } else {
$DefaultCCompiler = 'gcc'; $DefaultCCompiler = 'gcc';
$DefaultCXXCompiler = 'g++'; $DefaultCXXCompiler = 'g++';
} }
if ($FindBin::Script =~ /c\+\+-analyzer/) { if ($FindBin::Script =~ /c\+\+-analyzer/) {
▲ Show 20 Lines • Show All 696 Lines • Show Last 20 Lines