From 564700ab7c96b671b0c08a37e9a0e50f4b2fc176 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 24 Feb 2012 10:03:19 +0200
Subject: C++11 support (pass --std ODB compiler option in build makefiles)

---
 common/auto/makefile               | 5 +++++
 common/blob/makefile               | 5 +++++
 common/callback/makefile           | 5 +++++
 common/composite-id/makefile       | 5 +++++
 common/composite/makefile          | 5 +++++
 common/const-member/makefile       | 5 +++++
 common/const-object/makefile       | 5 +++++
 common/container/makefile          | 5 +++++
 common/ctor/makefile               | 5 +++++
 common/default/makefile            | 5 +++++
 common/enum/makefile               | 5 +++++
 common/erase-query/makefile        | 5 +++++
 common/include/makefile            | 5 +++++
 common/inheritance/makefile        | 5 +++++
 common/inverse/makefile            | 5 +++++
 common/lazy-ptr/makefile           | 5 +++++
 common/lifecycle/makefile          | 5 +++++
 common/no-id/makefile              | 5 +++++
 common/optimistic/makefile         | 5 +++++
 common/pragma/makefile             | 5 +++++
 common/query/makefile              | 5 +++++
 common/readonly/makefile           | 5 +++++
 common/relationship-query/makefile | 5 +++++
 common/relationship/makefile       | 6 +++++-
 common/schema/makefile             | 5 +++++
 common/template/makefile           | 5 +++++
 common/threads/makefile            | 5 +++++
 common/types/makefile              | 5 +++++
 common/view/makefile               | 5 +++++
 common/wrapper/makefile            | 5 +++++
 30 files changed, 150 insertions(+), 1 deletion(-)

(limited to 'common')

diff --git a/common/auto/makefile b/common/auto/makefile
index f05d4cc..188267e 100644
--- a/common/auto/makefile
+++ b/common/auto/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/blob/makefile b/common/blob/makefile
index 7e0a789..5d1ac1c 100644
--- a/common/blob/makefile
+++ b/common/blob/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/callback/makefile b/common/callback/makefile
index 37f4cd4..0c85d05 100644
--- a/common/callback/makefile
+++ b/common/callback/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/composite-id/makefile b/common/composite-id/makefile
index 774b8c7..a10dd57 100644
--- a/common/composite-id/makefile
+++ b/common/composite-id/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/composite/makefile b/common/composite/makefile
index 4bac352..602a9ab 100644
--- a/common/composite/makefile
+++ b/common/composite/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/const-member/makefile b/common/const-member/makefile
index 45c4a6b..1c22843 100644
--- a/common/const-member/makefile
+++ b/common/const-member/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/const-object/makefile b/common/const-object/makefile
index d335d43..47d9a0b 100644
--- a/common/const-object/makefile
+++ b/common/const-object/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/container/makefile b/common/container/makefile
index 6c17fcf..b81b891 100644
--- a/common/container/makefile
+++ b/common/container/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/ctor/makefile b/common/ctor/makefile
index f38995c..abcb78c 100644
--- a/common/ctor/makefile
+++ b/common/ctor/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/default/makefile b/common/default/makefile
index c8e6b31..ad2010a 100644
--- a/common/default/makefile
+++ b/common/default/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/enum/makefile b/common/enum/makefile
index 3d9aeba..f22da16 100644
--- a/common/enum/makefile
+++ b/common/enum/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/erase-query/makefile b/common/erase-query/makefile
index 04483f9..5fc5305 100644
--- a/common/erase-query/makefile
+++ b/common/erase-query/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/include/makefile b/common/include/makefile
index fa392c7..7320605 100644
--- a/common/include/makefile
+++ b/common/include/makefile
@@ -80,7 +80,12 @@ endif
 
 # How to.
 #
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/inheritance/makefile b/common/inheritance/makefile
index 633801c..26d27eb 100644
--- a/common/inheritance/makefile
+++ b/common/inheritance/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/inverse/makefile b/common/inverse/makefile
index d229c3d..30bd265 100644
--- a/common/inverse/makefile
+++ b/common/inverse/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile
index 10d0faf..77053e3 100644
--- a/common/lazy-ptr/makefile
+++ b/common/lazy-ptr/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile
index 8304fe3..210bb46 100644
--- a/common/lifecycle/makefile
+++ b/common/lifecycle/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/no-id/makefile b/common/no-id/makefile
index c0ba422..9c6eeec 100644
--- a/common/no-id/makefile
+++ b/common/no-id/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/optimistic/makefile b/common/optimistic/makefile
index 5728a27..80e32f5 100644
--- a/common/optimistic/makefile
+++ b/common/optimistic/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/pragma/makefile b/common/pragma/makefile
index b44fc8d..09696c3 100644
--- a/common/pragma/makefile
+++ b/common/pragma/makefile
@@ -97,7 +97,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/query/makefile b/common/query/makefile
index dfdd5bd..8d08b04 100644
--- a/common/query/makefile
+++ b/common/query/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/readonly/makefile b/common/readonly/makefile
index 713b035..4409927 100644
--- a/common/readonly/makefile
+++ b/common/readonly/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/relationship-query/makefile b/common/relationship-query/makefile
index b73cfe4..619cf8b 100644
--- a/common/relationship-query/makefile
+++ b/common/relationship-query/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/relationship/makefile b/common/relationship/makefile
index f422860..4a6425e 100644
--- a/common/relationship/makefile
+++ b/common/relationship/makefile
@@ -98,8 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
-
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/schema/makefile b/common/schema/makefile
index f221f06..9a3fb92 100644
--- a/common/schema/makefile
+++ b/common/schema/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/template/makefile b/common/template/makefile
index 0557801..bf28ba1 100644
--- a/common/template/makefile
+++ b/common/template/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/threads/makefile b/common/threads/makefile
index a87e47a..1c3550d 100644
--- a/common/threads/makefile
+++ b/common/threads/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/types/makefile b/common/types/makefile
index 28a3650..f81b56f 100644
--- a/common/types/makefile
+++ b/common/types/makefile
@@ -96,7 +96,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/view/makefile b/common/view/makefile
index fb8155b..26566ce 100644
--- a/common/view/makefile
+++ b/common/view/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/common/wrapper/makefile b/common/wrapper/makefile
index 3ea462d..101ac93 100644
--- a/common/wrapper/makefile
+++ b/common/wrapper/makefile
@@ -98,7 +98,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
-- 
cgit v1.1