aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-15 12:35:17 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-15 12:35:17 +0200
commit53aa4375ca5a3a17a0869fbaa34a88817920ec56 (patch)
treeb8ac117ed035073b2e3efa6cd375570e2697ba24
parente74afd7ae8d6b77433594ec3a3fba83a735ab22e (diff)
Include host machine in --version output
-rw-r--r--build2/b.cxx1
-rw-r--r--build2/buildfile2
-rw-r--r--build2/context.cxx3
3 files changed, 2 insertions, 4 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index d16d828..0522d47 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -147,6 +147,7 @@ main (int argc, char* argv[])
{
cout << "build2 " << BUILD2_VERSION_STR<< endl
<< "libbutl " << LIBBUTL_VERSION_STR << endl
+ << "host " << BUILD2_HOST_TRIPLET << endl
<< "Copyright (c) 2014-2016 Code Synthesis Ltd" << endl
<< "This is free software released under the MIT license." << endl;
return 0;
diff --git a/build2/buildfile b/build2/buildfile
index 1281e9e..3aa515f 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -86,7 +86,7 @@ else
var=cxx.host
}
-obj{context}: cxx.poptions += -DBUILD2_HOST_TRIPLET='"'$($var)'"'
+obj{b context}: cxx.poptions += -DBUILD2_HOST_TRIPLET='"'$($var)'"'
# 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.
diff --git a/build2/context.cxx b/build2/context.cxx
index e50a74a..670397f 100644
--- a/build2/context.cxx
+++ b/build2/context.cxx
@@ -266,9 +266,6 @@ namespace build2
// the target class (e.g., linux, windows, macosx).
//
{
-#ifndef BUILD2_HOST_TRIPLET
-#error BUILD2_HOST_TRIPLET is not defined
-#endif
// Did the user ask us to use config.guess?
//
string orig (