Mercurial > hg > openjdk > jigsaw > jdk
changeset 7364:7a96ead5ea89
Merge
author | katleman |
---|---|
date | Tue, 30 Apr 2013 14:40:54 -0700 |
parents | 53be90fb39d6 (current diff) 12af7c32c648 (diff) |
children | 55c7b90fe57e |
files | |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/GensrcX11Wrappers.gmk Thu Apr 25 09:24:24 2013 -0700 +++ b/makefiles/GensrcX11Wrappers.gmk Tue Apr 30 14:40:54 2013 -0700 @@ -86,10 +86,15 @@ $(MKDIR) -p $(@D) $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $* + # use -m32/-m64 only if the compiler supports it + ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG),true) + MEMORY_MODEL_FLAG="-m$*" + endif + # Compile the C code into an executable. $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c $(MKDIR) -p $(@D) - (cd $(@D) && $(CC) -m$* -o $@ $< \ + (cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \ $(X_CFLAGS) \ $(X_LIBS) \ -I$(JDK_OUTPUTDIR)/include \