提交 5dce0fca 编写于 作者: T twisti

6799452: HotSpot tests Makefile should take care of ALT_SLASH_JAVA

Summary: The HotSpot tests Makefile has a hardcoded SLASH_JAVA which makes it difficult to run the tests on non-Sun build machines which do not have a /java infrastructure.
Reviewed-by: kamg
上级 b25094e5
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
# Get OS/ARCH specifics # Get OS/ARCH specifics
OSNAME = $(shell uname -s) OSNAME = $(shell uname -s)
SLASH_JAVA = /java
ifeq ($(OSNAME), SunOS) ifeq ($(OSNAME), SunOS)
PLATFORM = solaris PLATFORM = solaris
SLASH_JAVA = /java
ARCH = $(shell uname -p) ARCH = $(shell uname -p)
ifeq ($(ARCH), i386) ifeq ($(ARCH), i386)
ARCH=i586 ARCH=i586
...@@ -38,6 +38,7 @@ ifeq ($(OSNAME), SunOS) ...@@ -38,6 +38,7 @@ ifeq ($(OSNAME), SunOS)
endif endif
ifeq ($(OSNAME), Linux) ifeq ($(OSNAME), Linux)
PLATFORM = linux PLATFORM = linux
SLASH_JAVA = /java
ARCH = $(shell uname -m) ARCH = $(shell uname -m)
ifeq ($(ARCH), i386) ifeq ($(ARCH), i386)
ARCH = i586 ARCH = i586
...@@ -62,6 +63,10 @@ ifeq ($(OSNAME), Windows_NT) ...@@ -62,6 +63,10 @@ ifeq ($(OSNAME), Windows_NT)
EXESUFFIX = .exe EXESUFFIX = .exe
endif endif
ifdef ALT_SLASH_JAVA
SLASH_JAVA = $(ALT_SLASH_JAVA)
endif
# Utilities used # Utilities used
CD = cd CD = cd
CP = cp CP = cp
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册