Skip to content

Commit 2107b8f

Browse files
committed
cons: Remove manual check for generated geometry files
The build system (Cons) is supposed to generate the source files (by processing `StarVMC/Geometry` directory) before attempting to build the libraries, i.e. `StarGeometry` and `xgeometry`.
1 parent 80ba582 commit 2107b8f

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

mgr/Conscript-standard

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,17 +288,13 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
288288
$trgt = "";
289289
$hfl = "";
290290
if ( $Dir =~ m/xgeometry/ ){
291-
$fcheck = $trgt = $OBJ."/".$Dir."/".$agM.".age";
292-
$fcheck =~ s/\#//; $trgt = "" if ( -e $fcheck);
291+
$trgt = "$OBJ/$Dir/$agM.age";
293292
} else {
294293
# Compat contains redundant defs only needed for the age
295294
# .h also needed for Dictionary building
296295
if ( $xml !~ m/Compat/ ){
297-
$fcheck = $trgt = $OBJ."/".$Dir."/".$agM.".cxx";
298-
$fcheck =~ s/\#//; $trgt = "" if ( -e $fcheck);
299-
300-
$fcheck = $hfl = $OBJ."/".$Dir."/".$agM.".h";
301-
$fcheck =~ s/\#//; $hfl = "" if ( -e $fcheck);
296+
$trgt = "$OBJ/$Dir/$agM.cxx";
297+
$hfl = "$OBJ/$Dir/$agM.h";
302298
}
303299
}
304300
# push but only if not present - if present, cons will find

0 commit comments

Comments
 (0)