make/sun/xawt/Makefile
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File
*** old/make/sun/xawt/Makefile	Fri May 25 00:59:08 2012
--- new/make/sun/xawt/Makefile	Fri May 25 00:59:04 2012

*** 1,7 **** --- 1,7 ---- # ! # Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. ! # Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 223,236 **** --- 223,242 ---- else # !macosx ifeq ($(ARCH_DATA_MODEL), 32) SIZERS = $(SIZER).32 SIZERS_C = $(SIZER_32_C) SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 + ifdef CROSS_COMPILE_ARCH + CFLAGS_32 = -m32 + endif else # !32 SIZERS = $(SIZER).64 SIZERS_C = $(SIZER_64_C) SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64 + ifdef CROSS_COMPILE_ARCH + CFLAGS_64 = -m64 + endif endif # 32 endif # !macosx endif # solaris # XXX Hack for 6185483 - use hard-coded sizes.
*** 262,281 **** --- 268,289 ---- WRAPPER_GENERATOR_DIR=$(GENSRCDIR)/sun/awt/X11/generator WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt $(SIZERS): $(SIZERS_C) $(prep-target) ifndef CROSS_COMPILE_ARCH $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o + SIZERS_CC = $(CC) else $(HOST_CC) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c $(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).o + SIZERS_CC = $(HOST_CC) endif + $(SIZERS): $(SIZERS_C) + $(prep-target) + + $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c + $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o + $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) $(prep-target) $(BOOT_JAVAC_CMD) -d $(WRAPPER_GENERATOR_TEMPDIR) $(WRAPPER_GENERATOR_JAVA) $(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)

make/sun/xawt/Makefile
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File