diff options
| author | Miodrag Milanović <mmicko@gmail.com> | 2019-12-07 08:20:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-07 08:20:20 +0100 |
| commit | f0887427da28c4993b44e0e7f3e3ac39f29c16fd (patch) | |
| tree | 8f6be3b5c7ff05a4dc54cd5fa6cd80b9d3b76a0b /bba | |
| parent | b8636902e3c943b52feca2414b3a66e8aad5a2f4 (diff) | |
| parent | 7220f456ef08dce93c63cc7185b1caaf5934e67b (diff) | |
| download | nextpnr-f0887427da28c4993b44e0e7f3e3ac39f29c16fd.tar.gz nextpnr-f0887427da28c4993b44e0e7f3e3ac39f29c16fd.tar.bz2 nextpnr-f0887427da28c4993b44e0e7f3e3ac39f29c16fd.zip | |
Merge pull request #368 from YosysHQ/bba_fix
Fix for bba to make it portable
Diffstat (limited to 'bba')
| -rw-r--r-- | bba/bba.cmake | 2 | ||||
| -rw-r--r-- | bba/main.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bba/bba.cmake b/bba/bba.cmake index a6995ca3..f1f5a754 100644 --- a/bba/bba.cmake +++ b/bba/bba.cmake @@ -5,7 +5,7 @@ ENDIF(CMAKE_CROSSCOMPILING) IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(bbasm bba/main.cc) - target_link_libraries(bbasm LINK_PUBLIC ${Boost_PROGRAM_OPTIONS_LIBRARY}) + target_link_libraries(bbasm LINK_PUBLIC ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) ENDIF(NOT CMAKE_CROSSCOMPILING) IF(NOT CMAKE_CROSSCOMPILING) diff --git a/bba/main.cc b/bba/main.cc index 9d7f9f8f..bff42028 100644 --- a/bba/main.cc +++ b/bba/main.cc @@ -19,6 +19,7 @@ */ #include <assert.h> +#include <boost/filesystem/convenience.hpp> #include <boost/program_options.hpp> #include <iostream> #include <map> @@ -446,8 +447,7 @@ int main(int argc, char **argv) fprintf(fileOut, "%s\n", s.c_str()); fprintf(fileOut, "const char %s[%d] =\n", streams[0].name.c_str(), int(data.size()) + 1); - char *bin_basename_buf = strdup(files.at(2).c_str()); - fprintf(fileOut, "#embed_str \"%s\"\n", basename(bin_basename_buf)); + fprintf(fileOut, "#embed_str \"%s\"\n", boost::filesystem::basename(files.at(2)).c_str()); fprintf(fileOut, ";\n"); for (auto &s : postText) |