From fb5bab834df474f5fa7c09f137aa375b5bca4718 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 18 Jun 2015 10:13:48 +0200
Subject: Move cxx.poptions setting from root.build to bpkg/buildfile

That's the new recommended way.

Also get rid of the library chain workaround that is no longer
necessary with latest build2.
---
 bpkg/buildfile           | 1 +
 build/root.build         | 1 -
 tests/manifest/buildfile | 4 +---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bpkg/buildfile b/bpkg/buildfile
index b084404..d887750 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -4,4 +4,5 @@
 
 import libs += libbutl
 lib{bpkg}: cxx{manifest-parser manifest-serializer manifest} $libs
+cxx.poptions += -I$src_root
 lib{bpkg}: cxx.export.poptions = -I$src_root
diff --git a/build/root.build b/build/root.build
index dc1c297..1361f7b 100644
--- a/build/root.build
+++ b/build/root.build
@@ -5,4 +5,3 @@
 using cxx
 
 cxx.std = 14
-cxx.poptions += -I$src_root
diff --git a/tests/manifest/buildfile b/tests/manifest/buildfile
index ee23ca9..8b2082b 100644
--- a/tests/manifest/buildfile
+++ b/tests/manifest/buildfile
@@ -2,9 +2,7 @@
 # copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-import libs += libbutl #@@ hack to get -I
-
-exe{driver}: cxx{driver} ../../bpkg/lib{bpkg} $libs
+exe{driver}: cxx{driver} ../../bpkg/lib{bpkg}
 
 include ../../bpkg/
 
-- 
cgit v1.1