Fix portals user-space compile breakage on x86_64.

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index b8b5c9d..b203a95 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -168,9 +168,9 @@ fi
 
 KINCFLAGS="$CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE \
        -I\$(top_srcdir)/include \
-       -I\$(top_srcdir)/portals/include -I$LINUX/include"
+       -I\$(top_srcdir)/portals/include"
 if test $host_cpu != "lib" ; then 
-    KINCFLAGS="$KINCFLAGS -I$LINUX/include"
+    KINCFLAGS="$KINCFLAGS -I$LINUX/include -I$LINUX/include"
 fi
 CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS"
 

diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index b8b5c9d..b203a95 100644 (file)
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -168,9 +168,9 @@ fi
 
 KINCFLAGS="$CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE \
        -I\$(top_srcdir)/include \
-       -I\$(top_srcdir)/portals/include -I$LINUX/include"
+       -I\$(top_srcdir)/portals/include"
 if test $host_cpu != "lib" ; then 
-    KINCFLAGS="$KINCFLAGS -I$LINUX/include"
+    KINCFLAGS="$KINCFLAGS -I$LINUX/include -I$LINUX/include"
 fi
 CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS"