Commit 5ebf4d54 authored by Lorenz Hüdepohl's avatar Lorenz Hüdepohl

Support gcc/6 on SLE_15

parent ce288a7f
Pipeline #74219 passed with stage
in 16 seconds
......@@ -65,11 +65,22 @@ def dist_prjconf_tags(distribution):
ExpandFlags: module:python36-3.6
""").strip()
sles15_prjconf_tags = textwrap.dedent(
"""
%if "%{_repository}" == "gcc_6" || "%{_repository}" == "gcc_7"
# gcc6/7 cannot deal with "-fstack-clash-protection" that has been added in SLE15 by default
Optflags: * -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
%endif
"""
).strip()
res = ""
if "CentOS" in distribution:
res += centos_prjconf_tags
if "CentOS_8" in distribution:
res += "\n" + centos8_prjconf_tags
if "SLE_15" in distribution:
res += sles15_prjconf_tags
return res
......@@ -604,7 +615,7 @@ def mpcdf_setup_subproject(api_url, project, distribution, microarchitecture,
prjconf_ours.append("Constraint: hostlabel {0}".format(microarchitecture))
prjconf_ours.append("Preinstall: mpcdf_{0}_directory".format(microarchitecture))
prjconf_ours.append("PublishFilter: ^mpcdf_.*$")
prjconf_ours.append("")
extra_tags = dist_prjconf_tags(distribution)
if extra_tags:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment