diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec
index 86a15f4..57254f0 100644
--- a/cross-aarch64-gcc7.spec
+++ b/cross-aarch64-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec
index fb5f154..119f066 100644
--- a/cross-arm-gcc7.spec
+++ b/cross-arm-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec
index 81703e1..deaec51 100644
--- a/cross-avr-gcc7.spec
+++ b/cross-avr-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec
index a1c5cbb..ab4906c 100644
--- a/cross-epiphany-gcc7-bootstrap.spec
+++ b/cross-epiphany-gcc7-bootstrap.spec
@@ -516,7 +516,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec
index 9b09f42..725e89d 100644
--- a/cross-epiphany-gcc7.spec
+++ b/cross-epiphany-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec
index 94e637e..16bc4c5 100644
--- a/cross-hppa-gcc7.spec
+++ b/cross-hppa-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec
index f28f88f..8ce28e8 100644
--- a/cross-i386-gcc7.spec
+++ b/cross-i386-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec
index 06ee9bd..c6d3314 100644
--- a/cross-m68k-gcc7.spec
+++ b/cross-m68k-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec
index 39d02e4..176839b 100644
--- a/cross-mips-gcc7.spec
+++ b/cross-mips-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec
index a22bc80..d407301 100644
--- a/cross-nvptx-gcc7.spec
+++ b/cross-nvptx-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec
index 9723b01..280e1b4 100644
--- a/cross-ppc64-gcc7.spec
+++ b/cross-ppc64-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec
index 6931b20..5aad493 100644
--- a/cross-ppc64le-gcc7.spec
+++ b/cross-ppc64le-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec
index 042c726..4433c0e 100644
--- a/cross-rx-gcc7-bootstrap.spec
+++ b/cross-rx-gcc7-bootstrap.spec
@@ -516,7 +516,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec
index 97ace82..67f0a1a 100644
--- a/cross-rx-gcc7.spec
+++ b/cross-rx-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec
index 37565c5..ec819e0 100644
--- a/cross-s390x-gcc7.spec
+++ b/cross-s390x-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec
index 6dd3770..7f0b290 100644
--- a/cross-sparc-gcc7.spec
+++ b/cross-sparc-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec
index d3ff473..40e5c03 100644
--- a/cross-sparc64-gcc7.spec
+++ b/cross-sparc64-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec
index 0b40b2f..cf37631 100644
--- a/cross-x86_64-gcc7.spec
+++ b/cross-x86_64-gcc7.spec
@@ -515,7 +515,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/gcc.spec.in b/gcc.spec.in
index 8c24105..a33157b 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1320,7 +1320,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec
index 5dd6508..da09006 100644
--- a/gcc7-testresults.spec
+++ b/gcc7-testresults.spec
@@ -706,7 +706,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
diff --git a/gcc7.spec b/gcc7.spec
index 682b6ef..462709f 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -2010,7 +2010,7 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
-%if 0%{sle_version} >= 150000
+%if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \