diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2009-10-04 18:25:51 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-10-04 18:25:51 +0200 |
| commit | 268d755af2e1ac89b8bcc675ab5b3fc93594b97a (patch) | |
| tree | 81df9db06fa60aa6dc56c08d074bd87255fe9858 /build | |
| parent | 2af733ac52fcd9c2b47285d5184c156f0a972be6 (diff) | |
Compensate for situations without dependency auto-generation
Diffstat (limited to 'build')
| -rw-r--r-- | build/bootstrap.make | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/build/bootstrap.make b/build/bootstrap.make index 89a8fde..3bb9d7e 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -16,6 +16,14 @@ ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),) include $(build)/bootstrap.make endif +def_goal := $(.DEFAULT_GOAL) + +# Include C++ configuration. We need to know if we are using the generic +# C++ compiler in which case we need to compensate for missing dependency +# auto-generation (see below). +# +$(call include,$(bld_root)/cxx/configuration.make) + # Aliases # ifdef %interactive% @@ -30,10 +38,6 @@ install: $(out_base)/.install dist: $(out_base)/.dist clean: $(out_base)/.clean -ifneq ($(filter $(.DEFAULT_GOAL),test install dist clean),) -.DEFAULT_GOAL := -endif - endif @@ -45,13 +49,30 @@ $(error dist_prefix is not set) endif endif - -# Don't include dependency info for certain targets. +# If we don't have dependency auto-generation then we need to manually +# make sure that CLI files are compiled before C++ file. To do this we +# make the object files ($2) depend in order-only on generated files +# ($3). # +ifeq ($(cxx_id),generic) + +define include-dep +$(if $2,$(eval $2: | $3)) +endef + +else + define include-dep $(call -include,$1) endef +endif + + +# Don't include dependency info for certain targets. +# ifneq ($(filter $(MAKECMDGOALS),clean disfigure),) include-dep = endif + +.DEFAULT_GOAL := $(def_goal) |