Skip to content

Commit f4f021c

Browse files
committed
(PA-6383) ensure PIE compile flags applied to future platforms
1 parent 436024a commit f4f021c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configs/projects/_shared-agent-settings.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
# stack canary and full RELRO.
153153
# We only do this on platforms that use their default OS toolchain since pl-gcc versions
154154
# are too old to support these flags.
155-
if platform.name =~ /sles-15|el-8|debian-10/ || platform.is_fedora?
155+
if (platform.is_sles? && platform.os_version.to_i >= 15) || (platform.is_el? && platform.os_version.to_i >= 8) || platform.is_debian? || (platform.is_ubuntu? && platform.os_version.to_i >= 20) || platform.is_fedora?
156156
proj.setting(:cppflags, "-I#{proj.includedir} -D_FORTIFY_SOURCE=2")
157157
proj.setting(:cflags, '-fstack-protector-strong -fno-plt -O2')
158158
proj.setting(:ldflags, "-L#{proj.libdir} -Wl,-rpath=#{proj.libdir},-z,relro,-z,now")

configs/projects/_shared-pe-bolt-server_with_ruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
# stack canary and full RELRO.
8888
# We only do this on platforms that use their default OS toolchain since pl-gcc versions
8989
# are too old to support these flags.
90-
if platform.name =~ /sles-15|el-8|debian-10/ || platform.is_fedora?
90+
if (platform.is_sles? && platform.os_version.to_i >= 15) || (platform.is_el? && platform.os_version.to_i >= 8) || platform.is_debian? || (platform.is_ubuntu? && platform.os_version.to_i >= 20) || platform.is_fedora?
9191
proj.setting(:cppflags, "-I#{proj.includedir} -D_FORTIFY_SOURCE=2")
9292
proj.setting(:cflags, '-fstack-protector-strong -fno-plt -O2')
9393
proj.setting(:ldflags, "-L#{proj.libdir} -Wl,-rpath=#{proj.libdir},-z,relro,-z,now")

0 commit comments

Comments
 (0)