diff options
Diffstat (limited to 'main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch')
| -rw-r--r-- | main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch b/main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch index a7ad2d8c3a..90de948f64 100644 --- a/main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch +++ b/main/clang/clang-0006-Link-with-z-now-by-default-for-Alpine-Linux.patch @@ -1,28 +1,19 @@ -From e089ab63916eada060fdfffbf7422c9b20bafe84 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 23 Feb 2016 10:08:17 +0000 -Subject: [PATCH 6/7] Link with -z now by default for Alpine Linux +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Sun, 16 Apr 2017 16:49:00 +0100 +Subject: [PATCH] Link with -z now by default for Alpine Linux ---- - lib/Driver/ToolChains.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp -index 82449bf..1a8ebf5 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp -@@ -3671,6 +3671,11 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) +@@ -4116,6 +4116,11 @@ - Distro Distro = DetectDistro(D, Arch); + Distro Distro(D.getVFS()); -+ if (Distro == AlpineLinux) { ++ if (Distro.IsAlpineLinux()) { + ExtraOpts.push_back("-z"); + ExtraOpts.push_back("now"); + } + - if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || Distro == AlpineLinux) { + if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux()) { ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); --- -2.7.3 - |