comparison make/windows/makefiles/vm.make @ 720:67a2f5ba5582

6684007: PrintAssembly plugin not available for linux or windows Reviewed-by: rasbold, jrose, twisti
author never
date Wed, 15 Apr 2009 09:53:54 -0700
parents 1ee8caae33af
children bd02caa94611
comparison
equal deleted inserted replaced
712:6e33bfd4139b 720:67a2f5ba5582
53 53
54 !if "$(Variant)" == "tiered" 54 !if "$(Variant)" == "tiered"
55 CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "COMPILER2" 55 CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "COMPILER2"
56 !endif 56 !endif
57 57
58 !if "$(BUILDARCH)" == "i486"
59 HOTSPOT_LIB_ARCH=i386
60 !else
61 HOTSPOT_LIB_ARCH=$(BUILDARCH)
62 !endif
63
58 # The following variables are defined in the generated local.make file. 64 # The following variables are defined in the generated local.make file.
59 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\"" 65 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\""
60 CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" 66 CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\""
61 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(BUILDARCH)\"" 67 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
62 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 68 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
63 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 69 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
64 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 70 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
65 71
66 CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" $(CPP_INCLUDE_DIRS) 72 CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" $(CPP_INCLUDE_DIRS)