aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-09-01 06:55:41 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-09-01 06:55:41 +0200
commit18a9c29e5ac61e6ee5f1349a1242540874c32cad (patch)
tree20a0b06f8b556fecbba4255b079b43bf441462df
parent39c76ef8c9b664c94d5d7b789457fa4045fdce04 (diff)
Minor build2-related updates
-rw-r--r--build/root.build4
-rw-r--r--odb/sqlite/buildfile2
2 files changed, 2 insertions, 4 deletions
diff --git a/build/root.build b/build/root.build
index 5898b63..0d01e14 100644
--- a/build/root.build
+++ b/build/root.build
@@ -11,14 +11,12 @@ ixx{*}: extension = ixx
txx{*}: extension = txx
cxx{*}: extension = cxx
-cxx.poptions =+ -I$out_root -I$src_root
-
# Load the cli module but only if it's available. This way a distribution that
# includes pre-generated files can be built without installing cli.
#
using? cli
-if! $cli.loaded
+if! $cli.configured
{
define cli: file
cli{*}: extension = cli
diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile
index d32d3b4..2ce398f 100644
--- a/odb/sqlite/buildfile
+++ b/odb/sqlite/buildfile
@@ -59,7 +59,7 @@ if $abi_prerelease
else
lib{odb-sqlite}: bin.lib.version = @-$abi_major.$abi_minor
-cxx.poptions =+ -DLIBODB_SQLITE_BUILD2
+cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_SQLITE_BUILD2
obja{*}: cxx.poptions += -DLIBODB_SQLITE_STATIC_BUILD
objs{*}: cxx.poptions += -DLIBODB_SQLITE_SHARED_BUILD