diff options
| author | kamg <none@none> | 2008-04-11 09:56:35 -0400 |
|---|---|---|
| committer | kamg <none@none> | 2008-04-11 09:56:35 -0400 |
| commit | 32e3fd6141baa47eee388d7f95b5e715a2ea2d9a (patch) | |
| tree | e6dabf83d7b50a2e982601f6dbff3795306defc6 /make/windows | |
| parent | dc6b00962b97cd8708784ae3f23e125062291460 (diff) | |
| parent | 1b15c7818556c54961865bf6c50cb037be2e076a (diff) | |
| download | jdk8u_hotspot-32e3fd6141baa47eee388d7f95b5e715a2ea2d9a.tar.gz | |
Merge
Diffstat (limited to 'make/windows')
| -rw-r--r-- | make/windows/makefiles/vm.make | 1 | ||||
| -rw-r--r-- | make/windows/platform_amd64 | 4 | ||||
| -rw-r--r-- | make/windows/platform_i486 | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/make/windows/makefiles/vm.make b/make/windows/makefiles/vm.make index ddfc87296..c911ab261 100644 --- a/make/windows/makefiles/vm.make +++ b/make/windows/makefiles/vm.make @@ -58,6 +58,7 @@ CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "COMPILER2" # The following variables are defined in the generated local.make file. CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\"" CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" +CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(BUILDARCH)\"" CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" diff --git a/make/windows/platform_amd64 b/make/windows/platform_amd64 index e19b48781..49a326e56 100644 --- a/make/windows/platform_amd64 +++ b/make/windows/platform_amd64 @@ -10,6 +10,6 @@ os_arch = windows_x86 os_arch_model = windows_x86_64 -compiler = visCPP +lib_arch = amd64 -gnu_dis_arch = amd64 +compiler = visCPP diff --git a/make/windows/platform_i486 b/make/windows/platform_i486 index a426305fb..bdb316810 100644 --- a/make/windows/platform_i486 +++ b/make/windows/platform_i486 @@ -10,7 +10,6 @@ os_arch = windows_x86 os_arch_model = windows_x86_32 -compiler = visCPP - -gnu_dis_arch = i386 +lib_arch = i386 +compiler = visCPP |