b=9508

r=adilger@clusterfs.com

When both gcc33 and gcc32 are available, we should use gcc33

diff --git a/lustre/kernel_patches/targets/2.6-rhel4.target.in b/lustre/kernel_patches/targets/2.6-rhel4.target.in
index de7cf84..0f0dc17 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-rhel4.target.in
+++ b/lustre/kernel_patches/targets/2.6-rhel4.target.in
@@ -16,8 +16,8 @@ JENSEN_ARCHS=""
 SMP_ARCHS="i686 x86_64 ia64"
 UP_ARCHS=""
 
-# the modules in this kernel do not build with gcc 3.3 or 2.96
-for cc in gcc32 gcc33 ; do
+# Modules in this kernel do not build with gcc 4 or gcc 2.96
+for cc in gcc33 gcc32 ; do
     if which $cc >/dev/null 2>/dev/null ; then
         export CC=$cc
         break

diff --git a/lustre/kernel_patches/targets/rhel-2.4.target.in b/lustre/kernel_patches/targets/rhel-2.4.target.in
index 8982d8f..c948164 100644 (file)
--- a/lustre/kernel_patches/targets/rhel-2.4.target.in
+++ b/lustre/kernel_patches/targets/rhel-2.4.target.in
@@ -16,7 +16,7 @@ SMP_ARCHS="i686 x86_64 ia64"
 UP_ARCHS=""
 
 # the modules in this kernel do not build with gcc 4, 3.4, or 2.96
-for cc in gcc32 gcc33 ; do
+for cc in gcc33 gcc32 ; do
     if which $cc >/dev/null 2>/dev/null ; then
         export CC=$cc
         break

diff --git a/lustre/kernel_patches/targets/sles-2.4.target.in b/lustre/kernel_patches/targets/sles-2.4.target.in
index 784560a..00c9292 100644 (file)
--- a/lustre/kernel_patches/targets/sles-2.4.target.in
+++ b/lustre/kernel_patches/targets/sles-2.4.target.in
@@ -17,8 +17,8 @@ JENSEN_ARCHS=""
 SMP_ARCHS="i686"
 UP_ARCHS=""
 
-# the modules in this kernel do not build with gcc 3.3 or 2.96
-for cc in gcc32 gcc33 ; do
+# the modules in this kernel do not build with gcc 4 or 2.96
+for cc in gcc33 gcc32 ; do
     if which $cc >/dev/null 2>/dev/null ; then
         export CC=$cc
         break