diff options
| -rw-r--r-- | src/ast/crate.cpp | 3 | ||||
| -rw-r--r-- | src/trans/codegen_c.cpp | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/ast/crate.cpp b/src/ast/crate.cpp index 58a08980..394cd47b 100644 --- a/src/ast/crate.cpp +++ b/src/ast/crate.cpp @@ -128,7 +128,8 @@ void Crate::load_extern_crate(Span sp, const ::std::string& name) } ExternCrate::ExternCrate(const ::std::string& name, const ::std::string& path): - m_name(name) + m_name(name), + m_filename(path) { TRACE_FUNCTION_F("name=" << name << ", path='" << path << "'"); m_hir = HIR_Deserialise(path, name); diff --git a/src/trans/codegen_c.cpp b/src/trans/codegen_c.cpp index 803930f8..32ac75f3 100644 --- a/src/trans/codegen_c.cpp +++ b/src/trans/codegen_c.cpp @@ -122,9 +122,7 @@ namespace { { for( const auto& crate : m_crate.m_ext_crates ) { - // TODO: Get the path from the CratePtr - //tmp.push_back(crate.second.m_filename + ".o"); - tmp.push_back("output/lib" + crate.first + ".hir.o"); + tmp.push_back(crate.second.m_filename + ".o"); args.push_back(tmp.back().c_str()); } args.push_back("-lm"); @@ -2415,7 +2413,6 @@ namespace { emit_dst(); m_of << " = " << e; ), (BorrowOf, - // TODO: If the type is Borrow of a DST, do a fat assign. if( ty.m_data.is_Function() ) { emit_dst(); m_of << " = " << Trans_Mangle(e); |