[patch] clang-common-18.1.4-r3.ebuild.patch

clang-common-18.1.4-r3.ebuild.patch (text/plain), 1.76 KB, created by nvinson234 on 2024-04-30 16:43:06 UTC

Backported patch from bug 928460

--- /home/nvinson/Repos/gentoo/sys-devel/clang-common/clang-common-18.1.4-r3.ebuild	2024-04-30 11:26:12.647284492 -0400
+++ /home/nvinson/Repos/magpie/sys-devel/clang-common/clang-common-18.1.4-r3.ebuild	2024-04-30 11:29:40.427283500 -0400
@@ -71,10 +71,15 @@ _doclang_cfg() {
 		newins - "${tool}.cfg" <<-EOF
 			# This configuration file is used by ${tool} driver.
 			@gentoo-common.cfg
 			@gentoo-common-ld.cfg
 		EOF
+		if [[ ${triple} == x86_64* ]]; then
+			cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
+				@gentoo-cet.cfg
+			EOF
+		fi
 	done
 
 	if use kernel_Darwin; then
 		cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
 			-lc++abi
@@ -83,10 +88,15 @@ _doclang_cfg() {
 
 	newins - "${triple}-clang-cpp.cfg" <<-EOF
 		# This configuration file is used by the ${triple}-clang-cpp driver.
 		@gentoo-common.cfg
 	EOF
+	if [[ ${triple} == x86_64* ]]; then
+		cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
+			@gentoo-cet.cfg
+		EOF
+	fi
 
 	# Install symlinks for triples with other vendor strings since some
 	# programs insist on mangling the triple.
 	local vendor
 	for vendor in gentoo pc unknown; do
@@ -173,15 +183,13 @@ src_install() {
 		-Xarch_host -fstack-protector-strong
 		-fPIE
 		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
 	EOF
 
-	if use amd64; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			-Xarch_host -fcf-protection=$(usex cet full none)
-		EOF
-	fi
+	newins - gentoo-cet.cfg <<-EOF
+		-Xarch_host -fcf-protection=$(usex cet full none)
+	EOF
 
 	if use kernel_Darwin; then
 		newins - gentoo-hardened-ld.cfg <<-EOF
 			# There was -Wl,-z,relro here, but it's not supported on Mac
 			# TODO: investigate whether -bind_at_load or -read_only_stubs will do the job