equal
deleted
inserted
replaced
25 |
25 |
26 # |
26 # |
27 # Common variables used by all the Java makefiles. This file should |
27 # Common variables used by all the Java makefiles. This file should |
28 # not contain rules. |
28 # not contain rules. |
29 # |
29 # |
|
30 |
|
31 ifdef OPENJDK |
|
32 ifneq ($(OPENJDK),true) |
|
33 x:=$(error "OPENJDK (if defined) can only be set to true") |
|
34 endif |
|
35 endif |
30 |
36 |
31 # Define absolute paths to TOPDIRs |
37 # Define absolute paths to TOPDIRs |
32 ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)") |
38 ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)") |
33 ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") |
39 ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") |
34 ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)") |
40 ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)") |
94 ifndef BUILD_JDK |
100 ifndef BUILD_JDK |
95 BUILD_JDK := $(JDK_SRC_AVAILABLE) |
101 BUILD_JDK := $(JDK_SRC_AVAILABLE) |
96 endif |
102 endif |
97 ifeq ($(JDK_SRC_AVAILABLE),true) |
103 ifeq ($(JDK_SRC_AVAILABLE),true) |
98 JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed) |
104 JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed) |
99 ifndef OPENJDK |
105 ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) |
100 ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) |
106 OPENJDK = true |
101 OPENJDK = true |
|
102 endif |
|
103 endif |
107 endif |
104 endif |
108 endif |
105 |
109 |
106 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile) |
110 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile) |
107 ifndef BUILD_DEPLOY |
111 ifndef BUILD_DEPLOY |
148 SKIP_COMPARE_IMAGES = true |
152 SKIP_COMPARE_IMAGES = true |
149 endif |
153 endif |
150 SKIP_OPENJDK_BUILD = true |
154 SKIP_OPENJDK_BUILD = true |
151 else |
155 else |
152 ifndef SKIP_OPENJDK_BUILD |
156 ifndef SKIP_OPENJDK_BUILD |
153 SKIP_OPENJDK_BUILD = false |
157 #SKIP_OPENJDK_BUILD = false |
154 # FIXUP: until freetype fixed on linux and solaris rmi build fixed |
158 # Until 6675289 is resolved, or this feature is removed. |
155 SKIP_OPENJDK_BUILD = true |
159 SKIP_OPENJDK_BUILD = true |
156 endif |
160 endif |
157 endif |
161 endif |
158 |
162 |
159 # Solaris 64 bit builds are not complete enough to ever do this |
163 # Solaris 64 bit builds are not complete enough to ever do this |