diff options
| -rw-r--r-- | debian/java_defaults.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk index 662fa94..d922d9c 100644 --- a/debian/java_defaults.mk +++ b/debian/java_defaults.mk @@ -9,6 +9,7 @@ java8_architectures = $(java9_architectures) \ m68k mips mipsel mips64el \ powerpc powerpcspe ppc64 ppc64el \ s390x sh4 sparc64 x32 \ + illumos-amd64 \ kfreebsd-amd64 kfreebsd-i386 java7_architectures = $(java8_architectures) java6_architectures = $(java7_architectures) @@ -20,6 +21,7 @@ java_architectures = $(java5_architectures) java_plugin_architectures = \ amd64 arm64 armel armhf i386 \ powerpc ppc64 ppc64el s390x \ + illumos-amd64 \ kfreebsd-amd64 kfreebsd-i386 \ x32 @@ -58,7 +60,12 @@ else jvm_archpath := jre/lib/$(jvm_archdir) endif -_jvm_osinclude = linux +_java_host_os := $(if $(DEB_HOST_ARCH_OS),$(DEB_HOST_ARCH_OS),$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)) +ifeq (illumos,$(_java_host_os)) + _jvm_osinclude = solaris +else + _jvm_osinclude = linux +endif ifeq ($(java_default_version),5) jvm_includes = \ -I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/$(_jvm_osinclude) |