archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
David Katleman 2012-01-11 16:13:21 -08:00
commit a742ba1ba3
6 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
jdk/make/common/Defs-linux.gmk
View file

@ -72,7 +72,6 @@ FDDLIBM_SUFFIX = a
SCRIPT_SUFFIX = SCRIPT_SUFFIX =
# CC compiler object code output directive flag value # CC compiler object code output directive flag value
CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required! CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
# Default OBJCOPY comes from GNU Binutils on Linux: # Default OBJCOPY comes from GNU Binutils on Linux:
DEF_OBJCOPY=/usr/bin/objcopy DEF_OBJCOPY=/usr/bin/objcopy

1
jdk/make/common/Defs-solaris.gmk
View file

@ -72,7 +72,6 @@ FDDLIBM_SUFFIX = a
SCRIPT_SUFFIX = SCRIPT_SUFFIX =
# CC compiler object code output directive flag value # CC compiler object code output directive flag value
CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required! CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
ifdef ENABLE_FULL_DEBUG_SYMBOLS ifdef ENABLE_FULL_DEBUG_SYMBOLS
# Only check for Full Debug Symbols support on Solaris if it is # Only check for Full Debug Symbols support on Solaris if it is

1
jdk/make/common/Defs-windows.gmk
View file

@ -36,7 +36,6 @@ include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
# CC compiler object code output directive flag value # CC compiler object code output directive flag value
CC_OBJECT_OUTPUT_FLAG = -Fo CC_OBJECT_OUTPUT_FLAG = -Fo
CC_PROGRAM_OUTPUT_FLAG = -Fe
# The suffix applied to the library name for FDLIBM # The suffix applied to the library name for FDLIBM
FDDLIBM_SUFFIX = lib FDDLIBM_SUFFIX = lib

7
jdk/make/common/Demo.gmk
View file

@ -319,9 +319,12 @@ $(DEMO_LIBRARY): $(DEMO_FULL_OBJECTS)
@$(prep-target) @$(prep-target)
ifeq ($(PLATFORM),windows) ifeq ($(PLATFORM),windows)
$(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE) $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE)
endif $(LINK.demo) $(SHARED_LIBRARY_FLAG) -Fe$@ \
$(LINK.demo) $(SHARED_LIBRARY_FLAG) $(CC_PROGRAM_OUTPUT_FLAG)$@ \
$(DEMO_FULL_OBJECTS) $(LDLIBS.demo) $(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
else
$(LINK.demo) $(SHARED_LIBRARY_FLAG) -o $@ \
$(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
endif
@$(call binary_file_verification,$@) @$(call binary_file_verification,$@)
# Generation of any javah include file, make sure objects are dependent on it # Generation of any javah include file, make sure objects are dependent on it

4
jdk/make/common/shared/Platform.gmk
View file

@ -147,8 +147,8 @@ ifeq ($(SYSTEM_UNAME), SunOS)
endif endif
# Suffix for file bundles used in previous release # Suffix for file bundles used in previous release
BUNDLE_FILE_SUFFIX=.tar BUNDLE_FILE_SUFFIX=.tar
# How much RAM does this machine have: # How much RAM does this machine have (zones send an error to stderr):
MB_OF_MEMORY=$(shell /usr/sbin/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3) MB_OF_MEMORY:=$(shell /usr/sbin/prtconf 2>/dev/null | fgrep 'Memory size:' | expand | cut -d' ' -f3)
endif endif
# Platform settings specific to Linux # Platform settings specific to Linux

21
jdk/make/tools/freetypecheck/Makefile
View file

@ -40,18 +40,19 @@ ifeq ($(PLATFORM), windows)
FT_OPTIONS = /nologo /c FT_OPTIONS = /nologo /c
FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll
FT_LD_OPTIONS = $(FREETYPE_LIB_PATH)/freetype.lib FT_LD_OPTIONS = $(FREETYPE_LIB_PATH)/freetype.lib
ifdef MT ifdef MT
FT_LD_OPTIONS += /manifest FT_LD_OPTIONS += /manifest
endif endif
else else
FT_OPTIONS = $(CFLAGS) FT_OPTIONS = $(CFLAGS)
FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH) FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH)
# Add runtime lib search path to ensure test will be runnable # Add runtime lib search path to ensure test will be runnable
ifeq ($(PLATFORM), solaris) ifeq ($(PLATFORM), linux)
FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH)
else #linux else # other unix
FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH)
endif endif
FT_LD_OPTIONS += -lfreetype
endif endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH) FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)/freetype2 FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)/freetype2
@ -70,12 +71,12 @@ ifeq ($(PLATFORM), windows)
$(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $< $(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $<
$(LINK) $(FT_LD_OPTIONS) /OUT:$(FT_TEST) $(FT_OBJ) $(LINK) $(FT_LD_OPTIONS) /OUT:$(FT_TEST) $(FT_OBJ)
$(CP) $(FREETYPE_DLL) $(@D)/ $(CP) $(FREETYPE_DLL) $(@D)/
ifdef MT ifdef MT
$(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/ $(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/
$(MT) /manifest $(FT_TEST).manifest /outputresource:$(FT_TEST);#1 $(MT) /manifest $(FT_TEST).manifest /outputresource:$(FT_TEST);#1
endif endif
else else
@$(CC) $(FT_OPTIONS) $(CC_PROGRAM_OUTPUT_FLAG)$@ $< $(FT_LD_OPTIONS) @$(CC) $(FT_OPTIONS) -o $@ $< $(FT_LD_OPTIONS)
endif endif
else else