changeset 26130:2ea1262921e0

8056246: Fix AIX build after the Modular Source Code change 8054834 Reviewed-by: erikj, ihse
author simonis
date Fri, 29 Aug 2014 12:02:20 +0200
parents 5ca768410aba
children 311b5e288cf5
files common/autoconf/basics.m4 common/autoconf/generated-configure.sh
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/basics.m4	Wed Aug 27 11:19:01 2014 +0200
+++ b/common/autoconf/basics.m4	Fri Aug 29 12:02:20 2014 +0200
@@ -849,7 +849,12 @@
   if test -f $DELETEDIR/TestIfFindSupportsDelete; then
     # No, it does not.
     rm $DELETEDIR/TestIfFindSupportsDelete
-    FIND_DELETE="-exec rm \{\} \+"
+    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+      # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list
+      FIND_DELETE="-print | xargs rm"
+    else
+      FIND_DELETE="-exec rm \{\} \+"
+    fi
     AC_MSG_RESULT([no])
   else
     AC_MSG_RESULT([yes])
--- a/common/autoconf/generated-configure.sh	Wed Aug 27 11:19:01 2014 +0200
+++ b/common/autoconf/generated-configure.sh	Fri Aug 29 12:02:20 2014 +0200
@@ -4321,7 +4321,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1408660646
+DATE_WHEN_GENERATED=1409306485
 
 ###############################################################################
 #
@@ -17284,7 +17284,12 @@
   if test -f $DELETEDIR/TestIfFindSupportsDelete; then
     # No, it does not.
     rm $DELETEDIR/TestIfFindSupportsDelete
-    FIND_DELETE="-exec rm \{\} \+"
+    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+      # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list
+      FIND_DELETE="-print | xargs rm"
+    else
+      FIND_DELETE="-exec rm \{\} \+"
+    fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   else