changeset 52469:4547f8303f2d

8213515: Improve freetype detection on linux/ppc64/ppc64le/s390x Reviewed-by: shade, ihse, stuefe
author simonis
date Thu, 08 Nov 2018 12:24:08 +0100
parents 187d16766a63
children bc5c7f63dbae
files make/autoconf/lib-freetype.m4
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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