forked from OctaForge/OctaBuild
fix incorrect rule find logic (always prefer "exact" rules)
parent
5461815ae3
commit
3f80d998a2
6
main.cc
6
main.cc
|
@ -282,14 +282,10 @@ struct ObState {
|
|||
return error(1, "redefinition of rule '%s'",
|
||||
target);
|
||||
if (sub.size() < frule->sub.size()) {
|
||||
if (!frule)
|
||||
frule = &sr;
|
||||
else {
|
||||
*frule = sr;
|
||||
rlist.pop();
|
||||
}
|
||||
}
|
||||
}
|
||||
} else frule = &sr;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -14,12 +14,12 @@ rule obuild $FILES [
|
|||
shell $CXX $OB_CXXFLAGS -o obuild_ob $sources
|
||||
]
|
||||
|
||||
rule cubescript_ob.o [@CUBESCRIPT_PATH/cubescript.cc] [
|
||||
rule %_ob.o %.cc [
|
||||
echo " CXX" $target
|
||||
shell $CXX $OB_CXXFLAGS -c -o $target $source
|
||||
]
|
||||
|
||||
rule %_ob.o %.cc [
|
||||
rule cubescript_ob.o [@CUBESCRIPT_PATH/cubescript.cc] [
|
||||
echo " CXX" $target
|
||||
shell $CXX $OB_CXXFLAGS -c -o $target $source
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue