Skip to content

Use concat_dir_file instead of local platform-specific code #3693

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

Merged
merged 1 commit into from
Jan 5, 2019
Merged

Use concat_dir_file instead of local platform-specific code #3693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 9 additions & 12 deletions src/goto-cc/compile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,31 +305,28 @@ bool compilet::add_files_from_archive(
/// \return true if found, false otherwise
bool compilet::find_library(const std::string &name)
{
std::string tmp;
std::string library_file_name;

for(const auto &library_path : library_paths)
{
#ifdef _WIN32
tmp = library_path + "\\lib";
#else
tmp = library_path + "/lib";
#endif
library_file_name = concat_dir_file(library_path, "lib" + name + ".a");

std::ifstream in(tmp+name+".a");
std::ifstream in(library_file_name);

if(in.is_open())
return !add_input_file(tmp+name+".a");
return !add_input_file(library_file_name);
else
{
std::string libname=tmp+name+".so";
library_file_name = concat_dir_file(library_path, "lib" + name + ".so");

switch(detect_file_type(libname))
switch(detect_file_type(library_file_name))
{
case file_typet::GOTO_BINARY:
return !add_input_file(libname);
return !add_input_file(library_file_name);

case file_typet::ELF_OBJECT:
warning() << "Warning: Cannot read ELF library " << libname << eom;
warning() << "Warning: Cannot read ELF library " << library_file_name
<< eom;
return warning_is_fatal;

default:
Expand Down