From 58786895f1d7a0af30cb7cd240c4dcb6133ea84d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 4 Sep 2016 18:32:24 +0200 Subject: Change freebsd target class to bsd --- butl/triplet | 2 +- butl/triplet.cxx | 4 ++-- tests/triplet/driver.cxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/butl/triplet b/butl/triplet index 013818e..69dc9df 100644 --- a/butl/triplet +++ b/butl/triplet @@ -85,7 +85,7 @@ namespace butl // // linux *-*-linux-* // macosx *-apple-darwin* - // freebsd *-*-freebsd* + // bsd *-*-(freebsd|openbsd|netbsd)* // windows *-*-win32-* | *-*-mingw32 // // References: diff --git a/butl/triplet.cxx b/butl/triplet.cxx index 39057a3..3ce5033 100644 --- a/butl/triplet.cxx +++ b/butl/triplet.cxx @@ -125,8 +125,8 @@ namespace butl class_ = "linux"; else if (vendor == "apple" && system == "darwin") class_ = "macosx"; - else if (system == "freebsd") - class_ = "freebsd"; + else if (system == "freebsd" || system == "openbsd" || system == "netbsd") + class_ = "bsd"; else if (system.compare (0, 5, "win32") == 0 || system == "mingw32") class_ = "windows"; else diff --git a/tests/triplet/driver.cxx b/tests/triplet/driver.cxx index 51bb7e0..ff9b065 100644 --- a/tests/triplet/driver.cxx +++ b/tests/triplet/driver.cxx @@ -94,11 +94,11 @@ main () assert (test ("x86_64-unknown-freebsd10.2", "x86_64-freebsd10.2", - "x86_64", "", "freebsd", "10.2", "freebsd")); + "x86_64", "", "freebsd", "10.2", "bsd")); assert (test ("x86_64-pc-openbsd5.6", "x86_64-openbsd5.6", - "x86_64", "", "openbsd", "5.6")); + "x86_64", "", "openbsd", "5.6", "bsd")); assert (test ("sparc-sun-solaris2.9", "sparc-sun-solaris2.9", -- cgit v1.1