Re: RFR: JDK-8210949 Stop filtering out -xc99=%none for liblcms
Looks good. /Erik On 2018-09-20 01:35, Magnus Ihse Bursie wrote: We're currently filtering out -xc99=%none from CFLAGS_JDKLIB in liblcms. We do not need to to this. Appending -xc99=no_lib using CFLAGS_solaris is enough to override. Bug: https://bugs.openjdk.java.net/browse/JDK-8210949 Patch inline: diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -357,8 +357,6 @@ # The fast floor code loses precision. LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR -LCMS_CFLAGS_JDKLIB := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) - ifeq ($(USE_EXTERNAL_LCMS), true) # If we're using an external library, we'll just need the wrapper part. # By including it explicitly, all other files will be excluded. @@ -374,7 +372,7 @@ NAME := lcms, \ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ OPTIMIZATION := HIGHEST, \ - CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ + CFLAGS := $(CFLAGS_JDKLIB) \ $(LCMS_CFLAGS), \ CFLAGS_solaris := -xc99=no_lib, \ CFLAGS_windows := -DCMS_IS_WINDOWS_, \ /Magnus
RFR: JDK-8210949 Stop filtering out -xc99=%none for liblcms
We're currently filtering out -xc99=%none from CFLAGS_JDKLIB in liblcms. We do not need to to this. Appending -xc99=no_lib using CFLAGS_solaris is enough to override. Bug: https://bugs.openjdk.java.net/browse/JDK-8210949 Patch inline: diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -357,8 +357,6 @@ # The fast floor code loses precision. LCMS_CFLAGS=-DCMS_DONT_USE_FAST_FLOOR -LCMS_CFLAGS_JDKLIB := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) - ifeq ($(USE_EXTERNAL_LCMS), true) # If we're using an external library, we'll just need the wrapper part. # By including it explicitly, all other files will be excluded. @@ -374,7 +372,7 @@ NAME := lcms, \ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ OPTIMIZATION := HIGHEST, \ - CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ + CFLAGS := $(CFLAGS_JDKLIB) \ $(LCMS_CFLAGS), \ CFLAGS_solaris := -xc99=no_lib, \ CFLAGS_windows := -DCMS_IS_WINDOWS_, \ /Magnus
