aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-01 10:17:08 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-01 10:17:08 +0200
commit2944f088ae06e6f4495c8ac74714b1c57402f9e0 (patch)
treeab7ccfc963dfe42f2192e16943c3dcf97e9f3b99
parent4f1dd8760ad4442d24cc7e67092a9ac50a36ccd0 (diff)
Rename target triplet "macosx" class to "macos"
-rw-r--r--butl/target-triplet2
-rw-r--r--butl/target-triplet.cxx2
-rw-r--r--tests/target-triplet/driver.cxx2
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",