1.1 --- a/make/common/Defs-linux.gmk Mon Jan 09 19:12:44 2012 -0800
1.2 +++ b/make/common/Defs-linux.gmk Wed Jan 11 16:13:21 2012 -0800
1.3 @@ -72,7 +72,6 @@
1.4 SCRIPT_SUFFIX =
1.5 # CC compiler object code output directive flag value
1.6 CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
1.7 -CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
1.8
1.9 # Default OBJCOPY comes from GNU Binutils on Linux:
1.10 DEF_OBJCOPY=/usr/bin/objcopy
2.1 --- a/make/common/Defs-solaris.gmk Mon Jan 09 19:12:44 2012 -0800
2.2 +++ b/make/common/Defs-solaris.gmk Wed Jan 11 16:13:21 2012 -0800
2.3 @@ -72,7 +72,6 @@
2.4 SCRIPT_SUFFIX =
2.5 # CC compiler object code output directive flag value
2.6 CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
2.7 -CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
2.8
2.9 ifdef ENABLE_FULL_DEBUG_SYMBOLS
2.10 # Only check for Full Debug Symbols support on Solaris if it is
3.1 --- a/make/common/Defs-windows.gmk Mon Jan 09 19:12:44 2012 -0800
3.2 +++ b/make/common/Defs-windows.gmk Wed Jan 11 16:13:21 2012 -0800
3.3 @@ -36,7 +36,6 @@
3.4
3.5 # CC compiler object code output directive flag value
3.6 CC_OBJECT_OUTPUT_FLAG = -Fo
3.7 -CC_PROGRAM_OUTPUT_FLAG = -Fe
3.8
3.9 # The suffix applied to the library name for FDLIBM
3.10 FDDLIBM_SUFFIX = lib
4.1 --- a/make/common/Demo.gmk Mon Jan 09 19:12:44 2012 -0800
4.2 +++ b/make/common/Demo.gmk Wed Jan 11 16:13:21 2012 -0800
4.3 @@ -319,9 +319,12 @@
4.4 @$(prep-target)
4.5 ifeq ($(PLATFORM),windows)
4.6 $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(DEMO_VERSION_INFO) $(VERSIONINFO_RESOURCE)
4.7 + $(LINK.demo) $(SHARED_LIBRARY_FLAG) -Fe$@ \
4.8 + $(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
4.9 + else
4.10 + $(LINK.demo) $(SHARED_LIBRARY_FLAG) -o $@ \
4.11 + $(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
4.12 endif
4.13 - $(LINK.demo) $(SHARED_LIBRARY_FLAG) $(CC_PROGRAM_OUTPUT_FLAG)$@ \
4.14 - $(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
4.15 @$(call binary_file_verification,$@)
4.16
4.17 # Generation of any javah include file, make sure objects are dependent on it
5.1 --- a/make/common/shared/Platform.gmk Mon Jan 09 19:12:44 2012 -0800
5.2 +++ b/make/common/shared/Platform.gmk Wed Jan 11 16:13:21 2012 -0800
5.3 @@ -147,8 +147,8 @@
5.4 endif
5.5 # Suffix for file bundles used in previous release
5.6 BUNDLE_FILE_SUFFIX=.tar
5.7 - # How much RAM does this machine have:
5.8 - MB_OF_MEMORY=$(shell /usr/sbin/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3)
5.9 + # How much RAM does this machine have (zones send an error to stderr):
5.10 + MB_OF_MEMORY:=$(shell /usr/sbin/prtconf 2>/dev/null | fgrep 'Memory size:' | expand | cut -d' ' -f3)
5.11 endif
5.12
5.13 # Platform settings specific to Linux
6.1 --- a/make/tools/freetypecheck/Makefile Mon Jan 09 19:12:44 2012 -0800
6.2 +++ b/make/tools/freetypecheck/Makefile Wed Jan 11 16:13:21 2012 -0800
6.3 @@ -40,18 +40,19 @@
6.4 FT_OPTIONS = /nologo /c
6.5 FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll
6.6 FT_LD_OPTIONS = $(FREETYPE_LIB_PATH)/freetype.lib
6.7 -ifdef MT
6.8 - FT_LD_OPTIONS += /manifest
6.9 -endif
6.10 + ifdef MT
6.11 + FT_LD_OPTIONS += /manifest
6.12 + endif
6.13 else
6.14 FT_OPTIONS = $(CFLAGS)
6.15 FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH)
6.16 # Add runtime lib search path to ensure test will be runnable
6.17 - ifeq ($(PLATFORM), solaris)
6.18 - FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype
6.19 - else #linux
6.20 - FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
6.21 + ifeq ($(PLATFORM), linux)
6.22 + FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH)
6.23 + else # other unix
6.24 + FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH)
6.25 endif
6.26 + FT_LD_OPTIONS += -lfreetype
6.27 endif
6.28 FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
6.29 FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)/freetype2
6.30 @@ -70,12 +71,12 @@
6.31 $(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $<
6.32 $(LINK) $(FT_LD_OPTIONS) /OUT:$(FT_TEST) $(FT_OBJ)
6.33 $(CP) $(FREETYPE_DLL) $(@D)/
6.34 -ifdef MT
6.35 + ifdef MT
6.36 $(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/
6.37 $(MT) /manifest $(FT_TEST).manifest /outputresource:$(FT_TEST);#1
6.38 -endif
6.39 + endif
6.40 else
6.41 - @$(CC) $(FT_OPTIONS) $(CC_PROGRAM_OUTPUT_FLAG)$@ $< $(FT_LD_OPTIONS)
6.42 + @$(CC) $(FT_OPTIONS) -o $@ $< $(FT_LD_OPTIONS)
6.43 endif
6.44
6.45 else