From 01570ff5ee4568c63d8466cfb972cc31a2451a18 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 1 Apr 2017 10:18:43 +0200 Subject: Rename target triplet "macosx" class to "macos" --- build2/cc/link.cxx | 6 +++--- build2/cc/pkgconfig.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'build2') 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 ()); 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; -- cgit v1.1