From 2944f088ae06e6f4495c8ac74714b1c57402f9e0 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 1 Apr 2017 10:17:08 +0200 Subject: Rename target triplet "macosx" class to "macos" --- butl/target-triplet | 2 +- butl/target-triplet.cxx | 2 +- tests/target-triplet/driver.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/butl/target-triplet b/butl/target-triplet index d355d75..fe5e728 100644 --- a/butl/target-triplet +++ b/butl/target-triplet @@ -85,7 +85,7 @@ namespace butl // are recognized: // // linux *-*-linux-* - // macosx *-apple-darwin* + // macos *-apple-darwin* // bsd *-*-(freebsd|openbsd|netbsd)* // windows *-*-win32-* | *-*-mingw32 // diff --git a/butl/target-triplet.cxx b/butl/target-triplet.cxx index f7da724..7ebe9ec 100644 --- a/butl/target-triplet.cxx +++ b/butl/target-triplet.cxx @@ -109,7 +109,7 @@ namespace butl if (system.compare (0, 5, "linux") == 0) class_ = "linux"; else if (vendor == "apple" && system == "darwin") - class_ = "macosx"; + class_ = "macos"; else if (system == "freebsd" || system == "openbsd" || system == "netbsd") class_ = "bsd"; else if (system.compare (0, 5, "win32") == 0 || system == "mingw32") diff --git a/tests/target-triplet/driver.cxx b/tests/target-triplet/driver.cxx index 24cd02f..edc422c 100644 --- a/tests/target-triplet/driver.cxx +++ b/tests/target-triplet/driver.cxx @@ -90,7 +90,7 @@ main () // assert (test ("x86_64-apple-darwin14.5.0", "x86_64-apple-darwin14.5.0", - "x86_64", "apple", "darwin", "14.5.0", "macosx")); + "x86_64", "apple", "darwin", "14.5.0", "macos")); assert (test ("x86_64-unknown-freebsd10.2", "x86_64-freebsd10.2", -- cgit v1.1