From c225f3afe3e4d01ca5e24882f1d8004399e58780 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Oct 2009 07:51:57 +0200
Subject: Pass proper compiler options for different mappings

---
 build/dist | 70 +++++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 14 deletions(-)

(limited to 'build')

diff --git a/build/dist b/build/dist
index fe22adf..48dd7d9 100755
--- a/build/dist
+++ b/build/dist
@@ -224,13 +224,34 @@ gen 'ifeq ($(XSDE_LONGLONG),n)'
 gen 'EXTRA_XSDFLAGS += --no-long-long'
 gen 'endif'
 gen
-gen 'ifeq ($(XSDE_PARSER_VALIDATION),n)'
-gen 'EXTRA_XSDFLAGS += --suppress-parser-val'
-gen 'endif'
-gen
-gen 'ifeq ($(XSDE_SERIALIZER_VALIDATION),n)'
-gen 'EXTRA_XSDFLAGS += --suppress-serializer-val'
-gen 'endif'
+
+if [ "$cmd" = "cxx-hybrid" ]; then
+
+  gen 'ifeq ($(XSDE_PARSER_VALIDATION),n)'
+  gen 'EXTRA_XSDFLAGS += --suppress-parser-val'
+  gen 'endif'
+  gen
+  gen 'ifeq ($(XSDE_SERIALIZER_VALIDATION),n)'
+  gen 'EXTRA_XSDFLAGS += --suppress-serializer-val'
+  gen 'endif'
+
+elif [ "$cmd" = "cxx-parser" ]; then
+
+  gen 'ifeq ($(XSDE_PARSER_VALIDATION),n)'
+  gen 'EXTRA_XSDFLAGS += --suppress-validation'
+  gen 'endif'
+
+elif [ "$cmd" = "cxx-serializer" ]; then
+
+  gen 'ifeq ($(XSDE_SERIALIZER_VALIDATION),n)'
+  gen 'EXTRA_XSDFLAGS += --suppress-validation'
+  gen 'endif'
+
+elif [ "$cmd" != "" ]; then
+  error "unknown compiler command"
+  exit 1
+fi
+
 gen
 gen 'ifeq ($(XSDE_REUSE_STYLE),mixin)'
 gen 'EXTRA_XSDFLAGS += --reuse-style-mixin'
@@ -352,13 +373,34 @@ gen '!if "$(XSDE_LONGLONG)" == "n"'
 gen 'EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long'
 gen '!endif'
 gen
-gen '!if "$(XSDE_PARSER_VALIDATION)" == "n"'
-gen 'EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val'
-gen '!endif'
-gen
-gen '!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"'
-gen 'EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val'
-gen '!endif'
+
+if [ "$cmd" = "cxx-hybrid" ]; then
+
+  gen '!if "$(XSDE_PARSER_VALIDATION)" == "n"'
+  gen 'EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-parser-val'
+  gen '!endif'
+  gen
+  gen '!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"'
+  gen 'EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-serializer-val'
+  gen '!endif'
+
+elif [ "$cmd" = "cxx-parser" ]; then
+
+  gen '!if "$(XSDE_PARSER_VALIDATION)" == "n"'
+  gen 'EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation'
+  gen '!endif'
+
+elif [ "$cmd" = "cxx-serializer" ]; then
+
+  gen '!if "$(XSDE_SERIALIZER_VALIDATION)" == "n"'
+  gen 'EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --suppress-validation'
+  gen '!endif'
+
+elif [ "$cmd" != "" ]; then
+  error "unknown compiler command"
+  exit 1
+fi
+
 gen
 gen '!if "$(XSDE_REUSE_STYLE)" == "mixin"'
 gen 'EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --reuse-style-mixin'
-- 
cgit v1.1