diff options
| author | Yuri Pankov <yuri.pankov@nexenta.com> | 2018-04-02 05:25:08 +0300 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-04-10 09:30:22 -0400 |
| commit | 67048e0fd1ad0154eb457cc2b9e78c9d9938283b (patch) | |
| tree | 968a1c2bf8926344c938f68e6f22c2c5e2683be3 | |
| parent | cf798f092f6c8534fa312788d4fb163ac2818718 (diff) | |
| download | illumos-joyent-67048e0fd1ad0154eb457cc2b9e78c9d9938283b.tar.gz | |
9432 allow java 6 to be used for gate builds
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Alexander Pyhalov <alp@rsu.ru>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/Makefile.master | 4 | ||||
| -rw-r--r-- | usr/src/pkg/Makefile | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 6f65ae14c3..b59ba05d1e 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -119,7 +119,9 @@ ONBLD_TOOLS= $(BUILD_TOOLS)/onbld JAVA_HOME= /usr/java # define buildtime JAVA_ROOT JAVA_ROOT= /usr/java -# define to build with JAVA 8 +# Build uses java7 by default. Pass one the variables below set to empty +# string in the environment to override. +BLD_JAVA_6= $(POUND_SIGN) BLD_JAVA_8= $(POUND_SIGN) GCC_ROOT= /opt/gcc/4.4.4 diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index 02f1d34145..28b315f22c 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -167,9 +167,12 @@ PM_TRANSFORMS= common_actions publish restart_fmri facets defaults \ extract_metadata PM_INC= transforms manifests -JAVA_8_ONLY=$(BLD_JAVA_8) JAVA_7_ONLY= +JAVA_8_ONLY= +$(BLD_JAVA_6)JAVA_7_ONLY=$(POUND_SIGN) +$(BLD_JAVA_6)JAVA_8_ONLY=$(POUND_SIGN) $(BLD_JAVA_8)JAVA_7_ONLY=$(POUND_SIGN) +$(JAVA_7_ONLY)JAVA_8_ONLY=$(POUND_SIGN) PKGMOG_DEFINES= \ i386_ONLY=$(POUND_SIGN) \ |