equal
deleted
inserted
replaced
84 $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c : $(GENSRC_SIZER_DIR)/xlibtypes.txt $(BUILD_TOOLS) |
84 $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c : $(GENSRC_SIZER_DIR)/xlibtypes.txt $(BUILD_TOOLS) |
85 $(ECHO) "Generating X11 wrapper ($*-bit version)" |
85 $(ECHO) "Generating X11 wrapper ($*-bit version)" |
86 $(MKDIR) -p $(@D) |
86 $(MKDIR) -p $(@D) |
87 $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $* |
87 $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $* |
88 |
88 |
|
89 # use -m32/-m64 only if the compiler supports it |
|
90 ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG),true) |
|
91 MEMORY_MODEL_FLAG="-m$*" |
|
92 endif |
|
93 |
89 # Compile the C code into an executable. |
94 # Compile the C code into an executable. |
90 $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c |
95 $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c |
91 $(MKDIR) -p $(@D) |
96 $(MKDIR) -p $(@D) |
92 (cd $(@D) && $(CC) -m$* -o $@ $< \ |
97 (cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \ |
93 $(X_CFLAGS) \ |
98 $(X_CFLAGS) \ |
94 $(X_LIBS) \ |
99 $(X_LIBS) \ |
95 -I$(JDK_OUTPUTDIR)/include \ |
100 -I$(JDK_OUTPUTDIR)/include \ |
96 -I$(JDK_TOPDIR)/src/share/javavm/export \ |
101 -I$(JDK_TOPDIR)/src/share/javavm/export \ |
97 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \ |
102 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \ |