aboutsummaryrefslogtreecommitdiffstats
path: root/main/llvm/clang-3.6-alpine-use-z-relro.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-05-22 13:43:22 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-05-22 13:43:22 +0000
commit70622e24effd147a1d3e6206607f73ccdba33e8f (patch)
tree9f6ad37ec2977a564c47819340add467227c9dc0 /main/llvm/clang-3.6-alpine-use-z-relro.patch
parent95623fb7c14e2129b8e4f39e947d99dc85d3e158 (diff)
downloadaports-70622e24effd147a1d3e6206607f73ccdba33e8f.tar.bz2
aports-70622e24effd147a1d3e6206607f73ccdba33e8f.tar.xz
Revert "main/llvm: update patchset, switch to cmake, perform two-stage build with a minimal bootstrap compile of clang, add clang extras, update package list to split out clang documentation"
Diffstat (limited to 'main/llvm/clang-3.6-alpine-use-z-relro.patch')
-rw-r--r--main/llvm/clang-3.6-alpine-use-z-relro.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/main/llvm/clang-3.6-alpine-use-z-relro.patch b/main/llvm/clang-3.6-alpine-use-z-relro.patch
new file mode 100644
index 0000000000..bd7cea08c8
--- /dev/null
+++ b/main/llvm/clang-3.6-alpine-use-z-relro.patch
@@ -0,0 +1,19 @@
+diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
+index f789fd5..6d75b4b 100644
+--- a/lib/Driver/ToolChains.cpp
++++ b/lib/Driver/ToolChains.cpp
+@@ -2930,13 +2940,13 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+ GCCInstallation.getTriple().str() + "/bin").str());
+
+ Linker = GetLinkerPath();
+
+ Distro Distro = DetectDistro(Arch);
+
+- if (IsOpenSUSE(Distro) || IsUbuntu(Distro)) {
++ if (IsOpenSUSE(Distro) || IsUbuntu(Distro) || Distro == AlpineLinux) {
+ ExtraOpts.push_back("-z");
+ ExtraOpts.push_back("relro");
+ }
+
+ if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb)
+ ExtraOpts.push_back("-X");