diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-09-04 18:42:22 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-09-04 18:42:22 +0200 |
| commit | 0e73b872890a65d25bfe8b0344bdecfd17941f64 (patch) | |
| tree | 2dc3cd97912312e6a6591fc7ae9d5823e5348896 | |
| parent | 7e4bdc0f934cd1dd4e210cd58f8dc3a3d23902e1 (diff) | |
Adjust to freebsd to bsd target class change
| -rw-r--r-- | build2/cc/compile.cxx | 6 | ||||
| -rw-r--r-- | build2/cc/link.cxx | 4 | ||||
| -rw-r--r-- | build2/cc/pkgconfig.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx index c4df30f..fce5d21 100644 --- a/build2/cc/compile.cxx +++ b/build2/cc/compile.cxx @@ -348,7 +348,7 @@ namespace build2 { // On Darwin, Win32 -fPIC is the default. // - if (tclass == "linux" || tclass == "freebsd") + if (tclass == "linux" || tclass == "bsd") cs.append ("-fPIC"); } @@ -742,7 +742,7 @@ namespace build2 { // On Darwin, Win32 -fPIC is the default. // - if (tclass == "linux" || tclass == "freebsd") + if (tclass == "linux" || tclass == "bsd") args.push_back ("-fPIC"); } @@ -1492,7 +1492,7 @@ namespace build2 { // On Darwin, Win32 -fPIC is the default. // - if (tclass == "linux" || tclass == "freebsd") + if (tclass == "linux" || tclass == "bsd") args.push_back ("-fPIC"); } diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx index 5a8dcb7..9a8e21c 100644 --- a/build2/cc/link.cxx +++ b/build2/cc/link.cxx @@ -746,12 +746,12 @@ namespace build2 target& t, scope& bs, lorder lo, bool for_install) const { - // Use -rpath-link on targets that support it (Linux, FreeBSD). Note + // Use -rpath-link on targets that support it (Linux, *BSD). Note // that we don't really need it for top-level libraries. // if (for_install) { - if (tclass != "linux" && tclass != "freebsd") + if (tclass != "linux" && tclass != "bsd") return; } diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx index 08d5fef..8ab608a 100644 --- a/build2/cc/pkgconfig.cxx +++ b/build2/cc/pkgconfig.cxx @@ -115,7 +115,7 @@ namespace build2 { // Platform-specific locations. // - if (tclass == "freebsd") + if (tsys == "freebsd") { // On FreeBSD .pc files go to libdata/pkgconfig/, not lib/pkgconfig/. // |