From 9937edb5cbc4936d6687b1f6f71596ad6b20051b Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sun, 9 Jan 2022 08:27:59 -0800 Subject: [PATCH] Revert "clang doesn't support -fstack-clash-protection" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit e50fd757a297e9917f801cd2781559535f03ce13. Clang added `-ftack-clash-protection` in 2020.¹ Gitlab: #2177 ¹ https://reviews.llvm.org/D68720 --- CHANGELOG.md | 1 + tclpkg/gv/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81ed0589e..6fea453ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The Ming plugin that produced Shockwave files has been removed. This format was EOLed by Adobe in April 2019. #2160 - CentOS 7 packages now include libmingle and the `mingle` program. +- The tclpkg Makefile no longer suppresses `-fstack-clash-protection` ### Fixed diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am index bf74df6cf..b8f0fb3a9 100644 --- a/tclpkg/gv/Makefile.am +++ b/tclpkg/gv/Makefile.am @@ -175,8 +175,7 @@ gv.a: gv.cmxa pkgperldir = $(pkglibdir)/perl PERL ?= perl # cleanup for opencsw's perl which adds flags that g++ doesn't like -# use sed (because I don't know perl) to cleanup flags that clang doen't like -PERL_CC = `$(PERL) -MExtUtils::Embed -e ccopts | $(SED) 's/-fstack-clash-protection //g' | $(PERL) -pe 's/-x.*? //g'` +PERL_CC = `$(PERL) -MExtUtils::Embed -e ccopts | $(PERL) -pe 's/-x.*? //g'` PERL_LD = `$(PERL) -MExtUtils::Embed -e ldopts` VENDOR_ARCH = `$(PERL) -MConfig -e 'print $$Config{installvendorarch};'` PERL_data = gv.pm -- 2.50.1