From aa3583916131f21b6a936cd88c4b74a21151644f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 1 Oct 2017 03:57:03 +0200
Subject: Only enable modularized build if forced

The two boolean command line variables that control this are:

force_modules
force_std_modules
---
 tests/build/root.build | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'tests/build')

diff --git a/tests/build/root.build b/tests/build/root.build
index 6c98ba9..85724d4 100644
--- a/tests/build/root.build
+++ b/tests/build/root.build
@@ -2,15 +2,22 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-using cxx.guess
-
-if ($force_modules != true && $cxx.id == 'clang')
-  cxx.features.modules = false
-
 cxx.std = experimental
+cxx.features.modules = ($force_modules == true)
 
 using cxx
 
+if ($force_modules == true && !$cxx.features.modules)
+  fail 'c++ compiler does not support modules'
+
+if ($force_std_modules == true)
+{
+  import stdmod_lib = libstd-modules%liba{std-modules}
+  cxx.poptions += -D__cpp_lib_modules
+}
+else
+  stdmod_lib =
+
 hxx{*}: extension = hxx
 cxx{*}: extension = cxx
 
-- 
cgit v1.1