Fix dependency program arch.

SoftwareNetwork · Sep 22, 2023 · 185d8bf · 185d8bf
1 parent 55d4491
commit 185d8bf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/sw/driver/command.cpp b/src/sw/driver/command.cpp
@@ -364,7 +364,7 @@ CommandBuilder &CommandBuilder::operator<<(const ::sw::cmd::tag_env &t)
 CommandBuilder &CommandBuilder::operator<<(const ::sw::cmd::tag_prog_dep &t)
 {
     std::dynamic_pointer_cast<::sw::driver::Command>(c)->setProgram(t.d);
-    getTarget().addDummyDependency(t.d);
+    getTarget().addProgDependency(t.d);
     return *this;
 }
 

diff --git a/src/sw/driver/target/base.cpp b/src/sw/driver/target/base.cpp
@@ -753,6 +753,18 @@ DependencyPtr Target::addDummyDependency(const DependencyPtr &t)
     return t;
 }
 
+DependencyPtr Target::addProgDependency(const DependencyPtr &t)
+{
+    DummyDependencies.push_back(t);
+
+    auto hs = getHostSettings();
+    auto &ds = DummyDependencies.back()->settings;
+    ds.mergeMissing(hs);
+    ds["os"] = hs["os"];
+    ds["native"] = hs["native"];
+    return t;
+}
+
 DependencyPtr Target::addDummyDependency(const Target &t)
 {
     return addDummyDependency(std::make_shared<Dependency>(t));

diff --git a/src/sw/driver/target/base.h b/src/sw/driver/target/base.h
@@ -250,6 +250,7 @@ struct SW_DRIVER_CPP_API Target : ITarget, TargetBase, ProgramStorage,
 
     DependencyPtr addDummyDependency(const Target &);
     DependencyPtr addDummyDependency(const DependencyPtr &);
+    DependencyPtr addProgDependency(const DependencyPtr &);
     void addSourceDependency(const Target &);
     void addSourceDependency(const DependencyPtr &);