summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/lib/gen-classlist.sh.in
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath/lib/gen-classlist.sh.in')
-rwxr-xr-xlibjava/classpath/lib/gen-classlist.sh.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/libjava/classpath/lib/gen-classlist.sh.in b/libjava/classpath/lib/gen-classlist.sh.in
index 12845f2ccee..2f2dfc8a828 100755
--- a/libjava/classpath/lib/gen-classlist.sh.in
+++ b/libjava/classpath/lib/gen-classlist.sh.in
@@ -2,6 +2,8 @@
# @configure_input@
# Make sure sorting is done the same on all configurations
+# Note the use of sort -r below. This is done explicitly to work around
+# a gcj bug (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21418)
LC_ALL=C; export LC_ALL
LANG=C; export LANG
@@ -12,7 +14,7 @@ echo "Adding java source files from srcdir '@top_srcdir@'."
@FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu \
@top_srcdir@/org \
@top_srcdir@/external/w3c_dom @top_srcdir@/external/sax \
- -follow -type f -print | sort | grep '\.java$' \
+ -follow -type f -print | sort -r | grep '\.java$' \
> ${top_builddir}/lib/classes.1
# Generate files for the VM classes.
@@ -22,7 +24,7 @@ vm_dirlist=`echo "@vm_classes@" | sed -e 's/:/ /g'`
echo "Adding java source files from VM directory $vm_dirlist"
for dir in $vm_dirlist; do
(cd $dir
- for subdir in java javax gnu org; do
+ for subdir in java javax gnu org com; do
if test -d $subdir; then
@FIND@ $subdir -name '*.java' -print
fi
OpenPOWER on IntegriCloud