aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-28 11:09:34 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-28 11:09:34 +0200
commita4b29effed15b0a3e9309a4633a3ada37f3081e6 (patch)
treefe90342134ec2c99c7e0b2fdb0f1205afb966fd0
parent7124e550760eaaffaded5fa87c6104838499fea4 (diff)
Adjust to new build2 requirements
-rw-r--r--bpkg/buildfile3
-rw-r--r--build/root.build3
2 files changed, 3 insertions, 3 deletions
diff --git a/bpkg/buildfile b/bpkg/buildfile
index 9d4cc8f..8f834f6 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -4,9 +4,8 @@
import libs = libbpkg%lib{bpkg}
import libs += libbutl%lib{butl}
-import libs += libodb-sqlite%lib{odb-sqlite}
import libs += libodb%lib{odb}
-import libs += libsqlite3%lib{sqlite3} # @@ For now for static linking.
+import libs += libodb-sqlite%lib{odb-sqlite}
exe{bpkg}: \
{hxx cxx}{ archive } \
diff --git a/build/root.build b/build/root.build
index 68d9b87..aa003a3 100644
--- a/build/root.build
+++ b/build/root.build
@@ -2,6 +2,8 @@
# copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
+cxx.std = 14
+
using cxx
hxx{*}: extension =
@@ -9,7 +11,6 @@ ixx{*}: extension = ixx
txx{*}: extension = txx
cxx{*}: extension = cxx
-cxx.std = 11
cxx.poptions =+ -I$out_root -I$src_root
# Don't install tests.