Skip to content

Commit a481126

Browse files
Miscellaneous change
1 parent d359bc0 commit a481126

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

Src/runcpp2/CompilingLinking.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ namespace
429429

430430
if(!linkAsExecutable)
431431
{
432-
if(GetValueFromPlatformMap(profile.SharedLinkFile.Extension) == nullptr)
432+
if(!HasValueFromPlatformMap(profile.SharedLinkFile.Extension))
433433
{
434434
ssLOG_WARNING( "profile " << profile.Name << " missing extension for " <<
435435
"shared link file");
@@ -442,15 +442,15 @@ namespace
442442
}
443443
else
444444
{
445-
if(GetValueFromPlatformMap(profile.SharedLinkFile.Extension) == nullptr)
445+
if(!HasValueFromPlatformMap(profile.SharedLinkFile.Extension))
446446
{
447447
ssLOG_WARNING( "profile " << profile.Name << " missing extension for " <<
448448
"shared link file");
449449

450450
continue;
451451
}
452452

453-
if(GetValueFromPlatformMap(profile.StaticLinkFile.Extension) == nullptr)
453+
if(!HasValueFromPlatformMap(profile.StaticLinkFile.Extension))
454454
{
455455
ssLOG_WARNING( "profile " << profile.Name << " missing extension for " <<
456456
"static link file");

Src/runcpp2/DependenciesSetupHelper.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,14 +337,12 @@ namespace
337337
*runcpp2::GetValueFromPlatformMap(profile.SharedLinkFile.Extension));
338338

339339
if( *runcpp2::GetValueFromPlatformMap(profile.SharedLinkFile.Extension) !=
340-
*runcpp2::GetValueFromPlatformMap(profile.SharedLibraryFile.Extension) ||
341-
*runcpp2::GetValueFromPlatformMap(profile.SharedLinkFile.Prefix) !=
342-
*runcpp2::GetValueFromPlatformMap(profile.SharedLibraryFile.Prefix))
340+
*runcpp2::GetValueFromPlatformMap(profile.SharedLibraryFile.Extension))
343341
{
344342
outExtensionsToCopy.push_back(
345343
*runcpp2::GetValueFromPlatformMap(profile.SharedLibraryFile.Extension));
346344
}
347-
345+
348346
break;
349347
}
350348
case runcpp2::Data::DependencyLibraryType::OBJECT:

Src/runcpp2/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#include "runcpp2/StringUtil.hpp"
33
#include "runcpp2/runcpp2.hpp"
44

5-
//#include "TupleHash.hpp"
6-
75
#include "ssLogger/ssLog.hpp"
86

97
int ParseArgs( const std::unordered_map<std::string, runcpp2::OptionInfo>& longOptionsMap,

TODO.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@
55
- Change cache to be in the config folder
66
- Output compile_command.json
77
- Allow script info as standalone yaml file
8-
- Commandline options
98
- Allow Languages to override FileExtensions in compiler profile

0 commit comments

Comments
 (0)