From 5ef35e4125635f2be72d0873e22e2e44a2394d9b Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Thu, 24 Oct 2013 13:33:52 +0200
Subject: [PATCH] Abi: Fix Abi constructor to not disallow certain abi
 combinations

Change-Id: I58e51bb0756270cb7929c0edc0811342a67fbe31
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/projectexplorer/abi.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index b0c45aa001a..219a6f47f37 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -315,14 +315,15 @@ Abi::Abi(const Architecture &a, const OS &o,
             m_osFlavor = UnknownFlavor;
         break;
     case ProjectExplorer::Abi::BsdOS:
-        m_osFlavor = FreeBsdFlavor;
+        if (m_osFlavor < FreeBsdFlavor || m_osFlavor > OpenBsdFlavor)
+            m_osFlavor = UnknownFlavor;
         break;
     case ProjectExplorer::Abi::MacOS:
         if (m_osFlavor < GenericMacFlavor || m_osFlavor > GenericMacFlavor)
             m_osFlavor = UnknownFlavor;
         break;
     case ProjectExplorer::Abi::UnixOS:
-        if (m_osFlavor < GenericUnixFlavor || m_osFlavor > GenericUnixFlavor)
+        if (m_osFlavor < GenericUnixFlavor || m_osFlavor > SolarisUnixFlavor)
             m_osFlavor = UnknownFlavor;
         break;
     case ProjectExplorer::Abi::WindowsOS: