# HG changeset patch
# User simonis
# Date 1541676248 -3600
# Node ID 4547f8303f2d96c73fc3f7c5f4bd076ac6d6b5f3
# Parent  187d16766a63195de77140bba1be5b188ed4fed2
8213515: Improve freetype detection on linux/ppc64/ppc64le/s390x
Reviewed-by: shade, ihse, stuefe

diff -r 187d16766a63 -r 4547f8303f2d make/autoconf/lib-freetype.m4
--- a/make/autoconf/lib-freetype.m4	Thu Nov 08 12:03:18 2018 +0100
+++ b/make/autoconf/lib-freetype.m4	Thu Nov 08 12:24:08 2018 +0100
@@ -186,6 +186,9 @@
           FREETYPE_BASE_DIR="$SYSROOT/usr"
           if (test "x$OPENJDK_TARGET_CPU_BITS" = "x64"); then
             LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu], [well-known location])
+            if (test "x$FOUND_FREETYPE" != "xyes"); then
+              LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib64], [well-known location])
+            fi
           else
             LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
             if (test "x$FOUND_FREETYPE" != "xyes"); then