aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-01 10:18:43 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-01 10:18:43 +0200
commit01570ff5ee4568c63d8466cfb972cc31a2451a18 (patch)
treebd14a8f37742f2671778145e8bb08000f8b54b6e
parentf2a2e68e608839cf8de4a47392d3d221bb62c531 (diff)
Rename target triplet "macosx" class to "macos"
-rw-r--r--build2/cc/link.cxx6
-rw-r--r--build2/cc/pkgconfig.cxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx
index 68f3d64..69e8561 100644
--- a/build2/cc/link.cxx
+++ b/build2/cc/link.cxx
@@ -152,7 +152,7 @@ namespace build2
ext = "dll";
}
- else if (tclass == "macosx")
+ else if (tclass == "macos")
{
pfx = "lib";
ext = "dylib";
@@ -1203,7 +1203,7 @@ namespace build2
const libs_paths& paths (t.data<libs_paths> ());
const string& leaf (paths.effect_soname ().leaf ().string ());
- if (tclass == "macosx")
+ if (tclass == "macos")
{
// With Mac OS 10.5 (Leopard) Apple finally caved in and gave us
// a way to emulate vanilla -rpath.
@@ -1476,7 +1476,7 @@ namespace build2
//
if (lt == otype::s)
{
- if (tclass == "macosx")
+ if (tclass == "macos")
args.push_back ("-dynamiclib");
else
args.push_back ("-shared");
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index 72ae31b..00ab541 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -376,7 +376,7 @@ namespace build2
l == "-lgcc")
continue;
}
- else if (tclass == "macosx")
+ else if (tclass == "macos")
{
if (l == "-lSystem")
continue;