From b17185204db26c59e329f6f0af96e7265fd084ba Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 6 Jan 2013 08:09:29 +0000 Subject: [PATCH] Prepare for the upcoming version of Debian (jessie) git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171655 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 345f3d6b3c..fa217605e9 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -2058,6 +2058,7 @@ enum LinuxDistro { DebianLenny, DebianSqueeze, DebianWheezy, + DebianJessie, Exherbo, RHEL4, RHEL5, @@ -2095,7 +2096,7 @@ static bool IsOpenSuse(enum LinuxDistro Distro) { } static bool IsDebian(enum LinuxDistro Distro) { - return Distro >= DebianLenny && Distro <= DebianWheezy; + return Distro >= DebianLenny && Distro <= DebianJessie; } static bool IsUbuntu(enum LinuxDistro Distro) { @@ -2162,6 +2163,8 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) { return DebianSqueeze; else if (Data.startswith("wheezy/sid") || Data[0] == '7') return DebianWheezy; + else if (Data.startswith("jessie/sid") || Data[0] == '8') + return DebianJessie; return UnknownDistro; } @@ -2326,7 +2329,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) ExtraOpts.push_back("--no-add-needed"); if (Distro == DebianSqueeze || Distro == DebianWheezy || - IsOpenSuse(Distro) || + Distro == DebianJessie || IsOpenSuse(Distro) || (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) || (IsUbuntu(Distro) && Distro >= UbuntuKarmic)) ExtraOpts.push_back("--build-id"); -- 2.50.1