summaryrefslogtreecommitdiffabout
path: root/lib/component_factory.cc
Unidiff
Diffstat (limited to 'lib/component_factory.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/component_factory.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/component_factory.cc b/lib/component_factory.cc
index a5ced6b..2a2eefe 100644
--- a/lib/component_factory.cc
+++ b/lib/component_factory.cc
@@ -163,26 +163,25 @@ namespace sitecing {
163 args.push_back(o); 163 args.push_back(o);
164 file_list_t ancestors; 164 file_list_t ancestors;
165 get_ancestors(noro,ancestors); 165 get_ancestors(noro,ancestors);
166 for(file_list_t::const_iterator i=ancestors.begin();i!=ancestors.end();++i) { 166 for(file_list_t::const_iterator i=ancestors.begin();i!=ancestors.end();++i) {
167 string aso=root_so+*i+".so"; 167 string aso=root_so+*i+".so";
168 make(aso); 168 make(aso);
169 args.push_back(aso); 169 args.push_back(aso);
170 } 170 }
171 args.push_back("-o"); args.push_back(dp); 171 args.push_back("-o"); args.push_back(dp);
172 // TODO: "g++" configurable 172 // TODO: "g++" configurable
173 int rv = execute("g++",args,stdO,stdE); 173 int rv = execute("g++",args,stdO,stdE);
174 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) ) 174 if(! (WIFEXITED(rv) && !WEXITSTATUS(rv)) )
175 // TODO:TODO: linker_error 175 throw link_error(CODEPOINT,"failed to link component",noro);
176 throw compile_error(CODEPOINT,"failed to link component",noro);
177 return; 176 return;
178 }catch(utility_no_prefix& unp) { 177 }catch(utility_no_prefix& unp) {
179 throw konforka::exception(CODEPOINT,"component is outside of component root"); 178 throw konforka::exception(CODEPOINT,"component is outside of component root");
180 }catch(utility_no_suffix& uns) { } 179 }catch(utility_no_suffix& uns) { }
181 try { 180 try {
182 string noro = strip_prefix(dp,root_intermediate); 181 string noro = strip_prefix(dp,root_intermediate);
183 // compiler targets 182 // compiler targets
184 for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) { 183 for(int cct=0;cct<sizeof(cc_targets)/sizeof(*cc_targets);cct++) {
185 try { 184 try {
186 string nos = strip_suffix(noro,cc_targets[cct]); 185 string nos = strip_suffix(noro,cc_targets[cct]);
187 string cc = root_intermediate+nos+".cc"; 186 string cc = root_intermediate+nos+".cc";
188 string o = root_intermediate+nos+".o"; 187 string o = root_intermediate+nos+".o";