diff options
Diffstat (limited to 'main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch')
| -rw-r--r-- | main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch b/main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch index 090ec3d509..45fce6e13a 100644 --- a/main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch +++ b/main/clang/clang-0002-Use-z-relro-on-Alpine-Linux.patch @@ -1,25 +1,16 @@ -From 1898d32d22fddf3ba6c88addbd2af0159600b506 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 18 Feb 2016 17:41:23 +0100 -Subject: [PATCH 2/7] Use "-z relro" on Alpine Linux +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Sun, 16 Apr 2017 16:49:00 +0100 +Subject: [PATCH] Use "-z relro" on Alpine Linux ---- - lib/Driver/ToolChains.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp -index 70b53bd..46326f0 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp -@@ -3667,7 +3667,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) +@@ -4112,7 +4112,7 @@ - Distro Distro = DetectDistro(D, Arch); + Distro Distro(D.getVFS()); -- if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) { -+ if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || Distro == AlpineLinux) { +- if (Distro.IsOpenSUSE() || Distro.IsUbuntu()) { ++ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux()) { ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } --- -2.7.3 - |