From 977d07a3ae47ef204665d1eda2d642e5064724f3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 24 Jun 2019 12:01:19 +0200 Subject: Split build system into library and driver --- build2/buildfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'build2/buildfile') diff --git a/build2/buildfile b/build2/buildfile index ba8f25c..eb22266 100644 --- a/build2/buildfile +++ b/build2/buildfile @@ -5,14 +5,13 @@ import libs = libbutl%lib{butl} import libs += libpkgconf%lib{pkgconf} -./: exe{b}: {hxx ixx txx cxx}{+b} libue{b} +include ../libbuild2/ -libue{b}: {hxx ixx txx cxx}{** -b -b-options -config -version -**.test...} \ - {hxx ixx cxx}{b-options} {hxx}{config version} \ - $libs +./: exe{b}: {hxx ixx txx cxx}{+b} libue{b} -hxx{config}: in{config} -hxx{version}: in{version} $src_root/manifest +libue{b}: {hxx ixx txx cxx}{** -b -b-options -**.test...} \ + {hxx ixx cxx}{b-options} \ + ../libbuild2/lib{build2} $libs # Unit tests. # @@ -36,7 +35,7 @@ for t: cxx{**.test...} # # Pass our compiler target to be used as build2 host. # -obj{b context}: cxx.poptions += -DBUILD2_HOST_TRIPLET=\"$cxx.target\" +obj{b}: cxx.poptions += -DBUILD2_HOST_TRIPLET=\"$cxx.target\" # Pass native C and C++ compiler paths (not forgetting to escape backslashes # on Windows). These are used as defaults for BUILD2_DEFAULT_*. -- cgit v1.1