diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-09-01 06:55:41 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-09-01 06:55:41 +0200 |
| commit | 43259d803ca650b74bda47686b6cc79b615e9362 (patch) | |
| tree | 134907e4a04801941d81b80f488866905426f620 | |
| parent | 080fb39e0d41a2d293f2480a5de0673c605cfbdf (diff) | |
Minor build2-related updates
| -rw-r--r-- | build/root.build | 4 | ||||
| -rw-r--r-- | odb/pgsql/buildfile | 2 |
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/pgsql/buildfile b/odb/pgsql/buildfile index 50b3097..971617c 100644 --- a/odb/pgsql/buildfile +++ b/odb/pgsql/buildfile @@ -57,7 +57,7 @@ if $abi_prerelease else lib{odb-pgsql}: bin.lib.version = @-$abi_major.$abi_minor -cxx.poptions =+ -DLIBODB_PGSQL_BUILD2 +cxx.poptions =+ -I$out_root -I$src_root -DLIBODB_PGSQL_BUILD2 obja{*}: cxx.poptions += -DLIBODB_PGSQL_STATIC_BUILD objs{*}: cxx.poptions += -DLIBODB_PGSQL_SHARED_BUILD |