Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8081447: System JPEG builds include in-tree jpeglib.h, resulting in build failure
authorandrew
Fri, 29 May 2015 17:29:52 +0100
changeset 31159 6f5c7d192b2d
parent 31158 062c7363dd12
child 31160 426afa1c5005
8081447: System JPEG builds include in-tree jpeglib.h, resulting in build failure Summary: The include directive should be conditional on the use of the system JPEG library. Reviewed-by: prr, ihse
jdk/make/lib/Awt2dLibraries.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/lib/Awt2dLibraries.gmk	Fri May 29 18:32:58 2015 +0300
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Fri May 29 17:29:52 2015 +0100
@@ -491,7 +491,7 @@
     SRC := $(LIBJAVAJPEG_SRC), \
     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
     OPTIMIZATION := HIGHEST, \
-    CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJAVAJPEG_SRC)) \
+    CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
         $(LIBJAVA_HEADER_FLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
     DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \
jdk-sandbox