ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-20 09:16:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support use of MAKEFILE_LIST in makefile_overrides

Browse Source 
Refs #544
This commit is contained in:
Derek Bankieris 2018-02-07 09:11:24 -06:00
parent f4b4d00ac8
commit 4b2f6e660f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/trick/make_makefile_src
View File

@ -370,7 +370,7 @@ foreach $k ( sort keys %files_by_dir ) {
s/\$[{(]CURDIR[})]\/(\S+)/$k\/$1/g ;
s/(?:\$[{(]CURDIR[})]\/)?(\S*)\$[{(]OBJ_DIR[})]/$k\/$1object_\${TRICK_HOST_CPU}/g ;
s/\$[{(]CURDIR[})]/$k/g ;
while ( s,/[^/]+/\.\.,, ) {}
while ( s,/[^/.]+/\.\.,, ) {}
s//$comment/ ;
if ( s/^objects\s*:\s*// ) {
foreach my $ext ( qw{c C cc cxx cpp CPLUSPLUS l y} ) {
@ -388,8 +388,10 @@ foreach $k ( sort keys %files_by_dir ) {
}
}
close OV_FILE ;
print MAKEFILEOVER "\nMAKEFILE_LIST += $k/makefile_overrides\n" ;
print MAKEFILEOVER "\n# Overrides from $k\n\n" ;
print MAKEFILEOVER "$files_by_dir{$k}{overrides}\n" ;
print MAKEFILEOVER "\nMAKEFILE_LIST := \$(filter-out $k/makefile_overrides,\$(MAKEFILE_LIST))\n" ;
}
}
close MAKEFILEOVER ;