mirror of
https://github.com/nasa/trick.git
synced 2025-03-10 22:44:25 +00:00
Library dependencies not found in Trick 15 #325
OK, getting all strings that don't end in .so or .a is not good. Lots of problems. I made a list of file suffixes that include c and c++ source files now.
This commit is contained in:
parent
fb6617b788
commit
ca16b18e70
@ -114,7 +114,7 @@ sub get_depends($$) {
|
|||||||
s/\(|\)|\s+//g ;
|
s/\(|\)|\s+//g ;
|
||||||
s/\${(.+?)}/$ENV{$1}/eg ;
|
s/\${(.+?)}/$ENV{$1}/eg ;
|
||||||
}
|
}
|
||||||
@list_objects = grep !/\.so$|\.a$/ , @lib_list ;
|
@list_objects = grep /\.o$|\.c$|\.cc$|\.cpp$|\.cxx$|\.C$|\.c\+\+$/ , @lib_list ;
|
||||||
@list_libs = grep /\.so$|\.a$/ , @lib_list ;
|
@list_libs = grep /\.so$|\.a$/ , @lib_list ;
|
||||||
|
|
||||||
# Always add self-dependency
|
# Always add self-dependency
|
||||||
@ -123,7 +123,6 @@ sub get_depends($$) {
|
|||||||
# Now for each object, construct full path to object's src and find src file
|
# Now for each object, construct full path to object's src and find src file
|
||||||
foreach my $o (@list_objects) {
|
foreach my $o (@list_objects) {
|
||||||
|
|
||||||
next if ($o == "" or $o == "None" ) ;
|
|
||||||
# look for object code with source
|
# look for object code with source
|
||||||
$found_dep = find_depends_file($file,$o,$sim_ref) ;
|
$found_dep = find_depends_file($file,$o,$sim_ref) ;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user