(original) (raw)

--- jdk11/make/lib/Awt2dLibraries.gmk 2018-06-13 06:35:04.000000000 +0200 +++ jdk11/make/lib/Awt2dLibraries.gmk 2018-06-15 08:51:56.192470480 +0200 @@ -376,7 +376,7 @@ INCLUDE_FILES := (BUILDLIBLCMSINCLUDEFILES),OPTIMIZATION:=HIGHEST,CFLAGS:=(BUILD_LIBLCMS_INCLUDE_FILES), \ OPTIMIZATION := HIGHEST, \ CFLAGS := (BUILDLIBLCMSINCLUDEFILES),OPTIMIZATION:=HIGHEST,CFLAGS:=(LCMS_CFLAGS_JDKLIB) \ - (LCMSCFLAGS),+(LCMS_CFLAGS), \ + (LCMSCFLAGS),+(LCMS_CFLAGS) -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ CFLAGS_solaris := -xc99=no_lib, \ CFLAGS_windows := -DCMS_IS_WINDOWS_, \ EXTRA_HEADER_DIRS := \ @@ -425,7 +425,7 @@ NAME := javajpeg, \ INCLUDE_FILES := (BUILDLIBJAVAJPEGINCLUDEFILES),OPTIMIZATION:=HIGHEST,−CFLAGS:=(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ OPTIMIZATION := HIGHEST, \ - CFLAGS := (BUILDLIBJAVAJPEGINCLUDEFILES),OPTIMIZATION:=HIGHEST,−CFLAGS:=(CFLAGS_JDKLIB), \ + CFLAGS := (CFLAGSJDKLIB)−I(CFLAGS_JDKLIB) -I(CFLAGSJDKLIB)−I(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ HEADERS_FROM_SRC := (LIBJPEGHEADERSFROMSRC),DISABLEDWARNINGSgcc:=clobberedimplicit−fallthroughshift−negative−value,LDFLAGS:=(LIBJPEG_HEADERS_FROM_SRC), \ DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \ LDFLAGS := (LIBJPEGHEADERSFROMSRC),DISABLEDWARNINGSgcc:=clobberedimplicit−fallthroughshift−negative−value,LDFLAGS:=(LDFLAGS_JDKLIB) \