diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-10-06 11:00:24 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:29 +0200 |
| commit | 8226b906382a98b6680ef8b09866786f42510143 (patch) | |
| tree | 8e7e111a3e0e59739a716da8c8d003398ba7b684 /solenv | |
| parent | d19932ac5795df8df46fdc6cc60153d4e6d6042e (diff) | |
fix build.pl deps
Change-Id: Ia532558eb25c3745f9d43303358b785994f389fe
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/build.pl | 3 | ||||
| -rw-r--r-- | solenv/gbuild/tail_build_modules.mk | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 74d0f32ee087..b754f1665e02 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -556,9 +556,10 @@ sub expand_dependencies { sub get_tail_build_modules { my $tail_build_prj = shift; my $make = $ENV{'GNUMAKE'}; + my $build_type = $ENV{'BUILD_TYPE'}; my $tail_build_mk = "$tail_build_module_dir/Module_$tail_build_prj.mk"; - my $modules_str = `$make --no-print-directory -r -f $tail_build_modules_mk get_modules TAIL_BUILD_MK=$tail_build_mk`; + my $modules_str = `$make --no-print-directory -r -f $tail_build_modules_mk get_modules TAIL_BUILD_MK=$tail_build_mk BUILD_TYPE='$build_type'`; chomp $modules_str; my %modules = (); diff --git a/solenv/gbuild/tail_build_modules.mk b/solenv/gbuild/tail_build_modules.mk index e5301f4d9728..2ce60fd6af1f 100644 --- a/solenv/gbuild/tail_build_modules.mk +++ b/solenv/gbuild/tail_build_modules.mk @@ -29,6 +29,10 @@ TAIL_BUILD_MODULES := gb_Module_Module := +define gb_Helper_optional +$(if $(filter $(1),$(BUILD_TYPE)),$(2)) +endef + define gb_Module_add_moduledirs TAIL_BUILD_MODULES += $(2) |