aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-07-16 09:56:04 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-07-16 09:56:04 +0200
commitdc5874e5b8cdb2a8c8a5dc77a0bb4bd891079e3f (patch)
treef16fd91c5bb22e22faeb461c472f9cdc72608088 /build
parent82fba993cd1525dc7096e48ba3685f067ca9b896 (diff)
Fix code generation for circularly-dependant classes in separate headers
New tests: common/circular/{single,multiple}.
Diffstat (limited to 'build')
-rw-r--r--build/bootstrap.make7
1 files changed, 3 insertions, 4 deletions
diff --git a/build/bootstrap.make b/build/bootstrap.make
index aba7532..d4e5049 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -47,11 +47,10 @@ endif
# Database schema creation.
#
ifeq ($(filter $(db_id),sqlite),)
-$(out_base)/.test: schema-extra = \
-$(call message,sql $$1,$(dcf_root)/db-driver $$1,$(src_base)/$1)$(literal_newline)$(literal_tab)
+$(out_base)/.test: schema-body = \
+$(call message,sql $$1,$(dcf_root)/db-driver $$1,$1)$(literal_newline)$(literal_tab)
$(out_base)/.test: schema = \
-$(foreach s,$1,$(call schema-extra,$s))$(call \
-message,sql $$1,$(dcf_root)/db-driver $$1,$(out_base)/test.sql)
+$(foreach s,$(if $1,$1,$(out_base)/test.sql),$(call schema-body,$s))@:
endif
# Dist setup.