49 # general, they should NOT have the trailing / character. |
49 # general, they should NOT have the trailing / character. |
50 |
50 |
51 # Get shared system utilities macros defined |
51 # Get shared system utilities macros defined |
52 include $(BUILDDIR)/common/shared/Defs-utils.gmk |
52 include $(BUILDDIR)/common/shared/Defs-utils.gmk |
53 |
53 |
54 # Assumes ARCH, PLATFORM, ARCH_VM_SUBDIR, etc. have been defined. |
54 # Assumes ARCH, PLATFORM, etc. have been defined. |
55 |
55 |
56 # Simple pwd path |
56 # Simple pwd path |
57 define PwdPath |
57 define PwdPath |
58 $(shell cd $1 2> $(DEV_NULL) && pwd) |
58 $(shell cd $1 2> $(DEV_NULL) && pwd) |
59 endef |
59 endef |
155 |
155 |
156 # Make sure certain variables are non-empty at this point |
156 # Make sure certain variables are non-empty at this point |
157 _check_values:=\ |
157 _check_values:=\ |
158 $(call CheckValue,ARCH,),\ |
158 $(call CheckValue,ARCH,),\ |
159 $(call CheckValue,ARCH_DATA_MODEL,),\ |
159 $(call CheckValue,ARCH_DATA_MODEL,),\ |
160 $(call CheckValue,ARCH_VM_SUBDIR,),\ |
|
161 $(call CheckValue,VARIANT,),\ |
160 $(call CheckValue,VARIANT,),\ |
162 $(call CheckValue,PLATFORM,) |
161 $(call CheckValue,PLATFORM,) |
163 |
162 |
164 # Misc common settings for all workspaces |
163 # Misc common settings for all workspaces |
165 # This determines the version of the product, and the previous version or boot |
164 # This determines the version of the product, and the previous version or boot |
192 |
191 |
193 # Default variant is the optimized version of everything |
192 # Default variant is the optimized version of everything |
194 # can be OPT or DBG, default is OPT |
193 # can be OPT or DBG, default is OPT |
195 # Determine the extra pattern to add to the release name for debug/fastdebug. |
194 # Determine the extra pattern to add to the release name for debug/fastdebug. |
196 # Determine the JDK_IMPORT_VARIANT, so we get the right VM files copied over. |
195 # Determine the JDK_IMPORT_VARIANT, so we get the right VM files copied over. |
197 # Determine suffix for obj directory or OBJDIR, for .o files. |
|
198 # (by keeping .o files separate, just .o files, they don't clobber each |
|
199 # other, however, the library files will clobber each other). |
|
200 # |
196 # |
201 ifeq ($(VARIANT), DBG) |
197 ifeq ($(VARIANT), DBG) |
202 BUILD_VARIANT_RELEASE=-debug |
198 BUILD_VARIANT_RELEASE=-debug |
203 OBJDIRNAME_SUFFIX=_g |
|
204 else |
199 else |
205 BUILD_VARIANT_RELEASE= |
200 BUILD_VARIANT_RELEASE= |
206 OBJDIRNAME_SUFFIX= |
|
207 endif |
201 endif |
208 ifeq ($(FASTDEBUG), true) |
202 ifeq ($(FASTDEBUG), true) |
209 VARIANT=DBG |
203 VARIANT=DBG |
210 BUILD_VARIANT_RELEASE=-fastdebug |
204 BUILD_VARIANT_RELEASE=-fastdebug |
211 OBJDIRNAME_SUFFIX=_gO |
|
212 _JDK_IMPORT_VARIANT=/fastdebug |
205 _JDK_IMPORT_VARIANT=/fastdebug |
213 endif |
206 endif |
214 |
207 |
215 # Depending on the flavor of the build, add a -debug or -fastdebug to the name |
208 # Depending on the flavor of the build, add a -debug or -fastdebug to the name |
216 ifdef DEBUG_NAME |
209 ifdef DEBUG_NAME |