accomodate davidlt suggestions; drop icc specific instructions

cms-sw · Feb 6, 2017 · 00ad51d · 00ad51d
1 parent 3470a94
commit 00ad51d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/zlib-build.file b/zlib-build.file
@@ -4,11 +4,6 @@
 %setup -n zlib-%{realversion}
 
 %build
-%if "%{cmscompiler}" == "icc"
-%define cfgopts CC="icc -fPIC"
-%else
-%define cfgopts %{nil}
-%endif
 
 case %{cmsplatf} in
    *_amd64_*|*_mic_*)
@@ -20,7 +15,7 @@ case %{cmsplatf} in
      ./configure --prefix=%{i}
      ;;
    *)
-     %{cfgopts} ./configure --prefix=%{i}
+     ./configure --prefix=%{i}
      ;;
 esac
 

diff --git a/zlib.spec b/zlib.spec
@@ -1,5 +1,5 @@
 ### RPM external zlib 1.0
-%if "%{_arch}" == "x86_64"
+%ifarch x86_64
 Requires: zlib-x86_64
 %define ZLIB_PKG ZLIB_X86_64
 %else