OpenJDK / bsd-port / jdk8 / langtools
changeset 3781:0c2590fa85af tip
Merge from main OpenJDK repository
| author | Greg Lewis <glewis@eyesbeyond.com> |
|---|---|
| date | Fri, 08 Feb 2019 17:44:17 -0800 |
| parents | 95f8837bfbdc f92e6bed3fc0 |
| children | |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/test/Makefile Fri Dec 14 14:05:04 2018 +0000 +++ b/test/Makefile Fri Feb 08 17:44:17 2019 -0800 @@ -34,6 +34,14 @@ ARCH=i586 endif endif +ifneq ($(findstring BSD, $(OSNAME)), ) + PLATFORM = bsd + JT_PLATFORM = linux + ARCH = $(shell uname -p) + ifeq ($(ARCH), i386) + ARCH=i586 + endif +endif ifeq ($(OSNAME), Darwin) PLATFORM = bsd ARCH = $(shell uname -m)
--- a/test/tools/javah/ReadOldClass.sh Fri Dec 14 14:05:04 2018 +0000 +++ b/test/tools/javah/ReadOldClass.sh Fri Feb 08 17:44:17 2019 -0800 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` case "$OS" in - SunOS | Linux | Darwin | CYGWIN* ) + SunOS | Linux | *BSD | Darwin | CYGWIN* ) PS=":" FS="/" ;;