Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make/UpdateX11Wrappers.gmk
branchihse-cflags-rewrite-branch
changeset 56312 a52bcf4118eb
parent 56212 d1a4766aa7ac
parent 49241 de4b3a04feae
child 58665 30a5049a36bb 
--- a/make/UpdateX11Wrappers.gmk	Tue Mar 13 11:33:57 2018 +0100
+++ b/make/UpdateX11Wrappers.gmk	Thu Mar 15 09:33:36 2018 +0100
@@ -56,7 +56,8 @@
 $(X11WRAPPERS_OUTPUT)/src/data_generator.c: $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating X11 wrapper data generator source code)
 	$(call MakeDir, $(@D))
-	$(TOOL_WRAPPERGENERATOR) gen_c_source $@ $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt $(BITS)
+	$(call ExecuteWithLog, $@, \
+	    $(TOOL_WRAPPERGENERATOR) gen_c_source $@ $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt $(BITS))
 
 DATA_GENERATOR_INCLUDES := \
     -I$(TOPDIR)/src/hotspot/share/include \
@@ -77,7 +78,7 @@
     EXTRA_FILES := $(X11WRAPPERS_OUTPUT)/src/data_generator.c, \
     CFLAGS := $(X_CFLAGS) $(DATA_GENERATOR_INCLUDES) $(CFLAGS_JDKEXE), \
     LDFLAGS := $(LDFLAGS_JDKEXE), \
-    LIBS := $(X_LIBS) -lc, \
+    LIBS := $(X_LIBS), \
     OBJECT_DIR := $(X11WRAPPERS_OUTPUT)/objs, \
 ))
 
@@ -85,7 +86,11 @@
 $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(BITS).txt: $(BUILD_DATA_GENERATOR_TARGET)
 	$(call LogInfo, Generating X11 wrapper data files)
 	$(call MakeDir, $(@D))
-	$(BUILD_DATA_GENERATOR_TARGET) | $(SORT) > $@
+	$(call ExecuteWithLog, $(X11WRAPPERS_OUTPUT)/generation, \
+	    $(BUILD_DATA_GENERATOR_TARGET) | $(SORT) > $@)
+	$(ECHO) IMPORTANT: If you update the X11 wrapper data files, they most certainly
+	$(ECHO) need to be updated for both 32 and 64 bit platforms. You have now
+	$(ECHO) updated them for $(BITS) bit platforms only.
 
 TARGETS += $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(BITS).txt
jdk-sandbox