1.1 --- a/common/autoconf/spec.gmk.in Thu Sep 06 17:27:20 2012 -0700
1.2 +++ b/common/autoconf/spec.gmk.in Tue Sep 18 11:29:16 2012 -0700
1.3 @@ -23,7 +23,11 @@
1.4 # questions.
1.5 #
1.6
1.7 -# Configured @DATE_WHEN_CONFIGURED@ to build for a @OPENJDK_TARGET_SYSTEM@ system,
1.8 +# Configured @DATE_WHEN_CONFIGURED@ to build
1.9 +# for target system @OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU@
1.10 +# (called @OPENJDK_TARGET_AUTOCONF_NAME@ by autoconf)
1.11 +# on build system @OPENJDK_BUILD_OS@-@OPENJDK_BUILD_CPU@
1.12 +# (called @OPENJDK_BUILD_AUTOCONF_NAME@ by autoconf)
1.13 # using 'configure @CONFIGURE_COMMAND_LINE@'
1.14
1.15 # When calling macros, the spaces between arguments are
1.16 @@ -40,6 +44,17 @@
1.17 define NEWLINE:=
1.18 endef
1.19
1.20 +# A self-referential reference to this file.
1.21 +SPEC:=@SPEC@
1.22 +
1.23 +# Specify where the spec file is.
1.24 +MAKE_ARGS="SPEC=$(SPEC)"
1.25 +
1.26 +# TODO The logic for finding and setting MAKE is currently not working
1.27 +# well on windows. Disable it TEMPORARILY there for now.
1.28 +ifneq (@OPENJDK_TARGET_OS@,windows)
1.29 + MAKE:=@MAKE@
1.30 +endif
1.31
1.32 # Pass along the verbosity setting.
1.33 ifeq (,$(findstring VERBOSE=,$(MAKE)))
1.34 @@ -51,27 +66,16 @@
1.35 MAKE:=$(MAKE) -R
1.36 endif
1.37
1.38 -# Specify where the spec file is.
1.39 -ifeq (,$(findstring SPEC=,$(MAKE)))
1.40 - MAKE:=$(MAKE) SPEC=@SPEC@
1.41 -endif
1.42 -
1.43 # Specify where the common include directory for makefiles is.
1.44 ifeq (,$(findstring -I @SRC_ROOT@/common/makefiles,$(MAKE)))
1.45 MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
1.46 endif
1.47
1.48 -# A self-referential reference to this file.
1.49 -SPEC:=@SPEC@
1.50 -
1.51 # The "human readable" name of this configuration
1.52 CONF_NAME:=@CONF_NAME@
1.53
1.54 # The built jdk will run in this target system.
1.55 -OPENJDK_TARGET_SYSTEM:=@OPENJDK_TARGET_SYSTEM@
1.56 -
1.57 OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
1.58 -OPENJDK_TARGET_OS_FAMILY:=@OPENJDK_TARGET_OS_FAMILY@
1.59 OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
1.60
1.61 OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
1.62 @@ -79,12 +83,20 @@
1.63 OPENJDK_TARGET_CPU_BITS:=@OPENJDK_TARGET_CPU_BITS@
1.64 OPENJDK_TARGET_CPU_ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
1.65
1.66 +COMPILE_TYPE:=@COMPILE_TYPE@
1.67 +
1.68 +# Legacy support
1.69 +OPENJDK_TARGET_CPU_ISADIR:=@OPENJDK_TARGET_CPU_ISADIR@
1.70 +OPENJDK_TARGET_CPU_LIBDIR:=@OPENJDK_TARGET_CPU_LIBDIR@
1.71 +OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
1.72 +OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
1.73 +OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
1.74 +OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@
1.75 +OPENJDK_TARGET_OS_API_DIR:=@OPENJDK_TARGET_OS_API_DIR@
1.76 +
1.77 # We are building on this build system.
1.78 # When not cross-compiling, it is the same as the target.
1.79 -OPENJDK_BUILD_SYSTEM:=@OPENJDK_BUILD_SYSTEM@
1.80 -
1.81 OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@
1.82 -OPENJDK_BUILD_OS_FAMILY:=@OPENJDK_BUILD_OS_FAMILY@
1.83 OPENJDK_BUILD_OS_API:=@OPENJDK_BUILD_OS_API@
1.84
1.85 OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
1.86 @@ -96,21 +108,6 @@
1.87 REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@
1.88 REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
1.89
1.90 -# Old name for OPENJDK_TARGET_OS (aix,bsd,hpux,linux,macosx,solaris,windows etc)
1.91 -PLATFORM:=@OPENJDK_TARGET_OS@
1.92 -# Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of ia32 and x64.
1.93 -ARCH:=@LEGACY_OPENJDK_TARGET_CPU1@
1.94 -# Yet another name for arch used for an extra subdir below the jvm lib.
1.95 -# Uses i386 and amd64, instead of ia32 and x64.
1.96 -LIBARCH:=@LEGACY_OPENJDK_TARGET_CPU2@
1.97 -# Use to switch between solaris and windows subdirs in the jdk.
1.98 -LEGACY_OPENJDK_TARGET_OS_API:=@LEGACY_OPENJDK_TARGET_OS_API@
1.99 -# 32 or 64 bit
1.100 -ARCH_DATA_MODEL:=@OPENJDK_TARGET_CPU_BITS@
1.101 -# Legacy setting for building for a 64 bit machine.
1.102 -# If yes then this expands to _LP64:=1
1.103 -@LP64@
1.104 -ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
1.105 @SET_OPENJDK@
1.106 JIGSAW:=@JIGSAW@
1.107 LIBM:=-lm
1.108 @@ -143,6 +140,9 @@
1.109 HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@
1.110 COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
1.111
1.112 +# Location where build customization files may be found
1.113 +CUSTOM_MAKE_DIR:=@CUSTOM_MAKE_DIR@
1.114 +
1.115 # Information gathered from the version.numbers file.
1.116 JDK_MAJOR_VERSION:=@JDK_MAJOR_VERSION@
1.117 JDK_MINOR_VERSION:=@JDK_MINOR_VERSION@
1.118 @@ -171,17 +171,12 @@
1.119 # The JDK variant is a name for a specific set of modules to be compiled for the JDK.
1.120 JDK_VARIANT:=@JDK_VARIANT@
1.121
1.122 -# Legacy defines controlling the JDK variant embedded.
1.123 -@JAVASE_EMBEDDED@
1.124 -@MINIMIZE_RAM_USAGE@
1.125 -
1.126 # Should we compile support for running with a graphical UI? (ie headful)
1.127 # Should we compile support for running without? (ie headless)
1.128 SUPPORT_HEADFUL:=@SUPPORT_HEADFUL@
1.129 SUPPORT_HEADLESS:=@SUPPORT_HEADLESS@
1.130 # Legacy defines controlled by the SUPPORT_HEADLESS and SUPPORT_HEADFUL options.
1.131 @BUILD_HEADLESS@
1.132 -@BUILD_HEADLESS_ONLY@
1.133
1.134 # These are the libjvms that we want to build.
1.135 # The java launcher uses the default.
1.136 @@ -194,53 +189,43 @@
1.137 JVM_VARIANT_ZERO:=@JVM_VARIANT_ZERO@
1.138 JVM_VARIANT_ZEROSHARK:=@JVM_VARIANT_ZEROSHARK@
1.139
1.140 -# Legacy setting: OPT or DBG
1.141 -VARIANT:=@VARIANT@
1.142 -# Legacy setting: true or false
1.143 -FASTDEBUG:=@FASTDEBUG@
1.144 -# Legacy setting: debugging the class files?
1.145 -DEBUG_CLASSFILES:=@DEBUG_CLASSFILES@
1.146 +# Universal binaries on macosx
1.147 +MACOSX_UNIVERSAL=@MACOSX_UNIVERSAL@
1.148 +
1.149 # Legacy setting: -debug or -fastdebug
1.150 +# Still used in version string...
1.151 BUILD_VARIANT_RELEASE:=@BUILD_VARIANT_RELEASE@
1.152
1.153 -LANGTOOLS_OUTPUTDIR:=@LANGTOOLS_OUTPUTDIR@
1.154 -CORBA_OUTPUTDIR:=@CORBA_OUTPUTDIR@
1.155 -JAXP_OUTPUTDIR:=@JAXP_OUTPUTDIR@
1.156 -JAXWS_OUTPUTDIR:=@JAXWS_OUTPUTDIR@
1.157 -HOTSPOT_OUTPUTDIR:=@HOTSPOT_OUTPUTDIR@
1.158 -
1.159 -# This where a working jvm is built.
1.160 +# JDK_OUTPUTDIR specifies where a working jvm is built.
1.161 # You can run $(JDK_OUTPUTDIR)/bin/java
1.162 # Though the layout of the contents of $(JDK_OUTPUTDIR) is not
1.163 # yet the same as a default installation.
1.164 -JDK_OUTPUTDIR:=@OUTPUT_ROOT@/jdk
1.165 -
1.166 +#
1.167 # When you run "make install" it will create the standardized
1.168 -# layout for the jdk and the jre inside the images subdir.
1.169 +# layout for the jdk and the jre inside the IMAGES_OUTPUTDIR subdir.
1.170 # Then it will copy the contents of the jdk into the installation
1.171 # directory.
1.172 -IMAGES_OUTPUTDIR:=@OUTPUT_ROOT@/images
1.173
1.174 -LANGTOOLS_DIST:=@LANGTOOLS_DIST@
1.175 -CORBA_DIST:=@CORBA_DIST@
1.176 -JAXP_DIST:=@JAXP_DIST@
1.177 -JAXWS_DIST:=@JAXWS_DIST@
1.178 -HOTSPOT_DIST:=@HOTSPOT_DIST@
1.179 +BUILD_OUTPUT:=@BUILD_OUTPUT@
1.180 +LANGTOOLS_OUTPUTDIR=$(BUILD_OUTPUT)/langtools
1.181 +CORBA_OUTPUTDIR=$(BUILD_OUTPUT)/corba
1.182 +JAXP_OUTPUTDIR=$(BUILD_OUTPUT)/jaxp
1.183 +JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws
1.184 +HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
1.185 +JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
1.186 +IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
1.187
1.188 -# Legacy variables used by Release.gmk
1.189 -JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2sdk-image
1.190 -JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2re-image
1.191 -
1.192 -# Can be /sparcv9 or /amd64 on Solaris
1.193 -ISA_DIR:=@LEGACY_OPENJDK_TARGET_CPU3@
1.194 -BINDIR:=$(JDK_OUTPUTDIR)/bin$(ISA_DIR)
1.195 +LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist
1.196 +CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
1.197 +JAXP_DIST=$(JAXP_OUTPUTDIR)/dist
1.198 +JAXWS_DIST=$(JAXWS_OUTPUTDIR)/dist
1.199 +HOTSPOT_DIST=$(HOTSPOT_OUTPUTDIR)/dist
1.200
1.201 # The boot jdk to use
1.202 -ALT_BOOTDIR:=@BOOT_JDK@
1.203 BOOT_JDK:=@BOOT_JDK@
1.204 BOOT_JDK_JVMARGS:=@BOOT_JDK_JVMARGS@
1.205 BOOT_RTJAR:=@BOOT_RTJAR@
1.206 -BOOT_TOOLSJAR:=@BOOT_TOOLSJAR@
1.207 +BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar
1.208
1.209 # When compiling Java source to be run by the boot jdk
1.210 # use these extra flags, eg -source 6 -target 6
1.211 @@ -248,30 +233,18 @@
1.212
1.213 # Information about the build system
1.214 NUM_CORES:=@NUM_CORES@
1.215 -# This is used from the jdk build for C/C++ code.
1.216 -PARALLEL_COMPILE_JOBS:=@CONCURRENT_BUILD_JOBS@
1.217 -# Store javac server synchronization files here, and
1.218 -# the javac server log files.
1.219 -JAVAC_SERVERS:=@JAVAC_SERVERS@
1.220 -# Should we use a javac server or not? The javac server gives
1.221 -# an enormous performance improvement since it reduces the
1.222 -# startup costs of javac and reuses as much as possible of intermediate
1.223 -# compilation work. But if we want to compile with a non-Java
1.224 -# javac compiler, like gcj. Then we cannot use javac server and
1.225 -# this variable is set to false.
1.226 -JAVAC_USE_REMOTE:=@JAVAC_USE_REMOTE@
1.227 +# Enable sjavac support = use a javac server,
1.228 +# multi core javac compilation and dependency tracking.
1.229 +ENABLE_SJAVAC:=@ENABLE_SJAVAC@
1.230 +# Store sjavac server synchronization files here, and
1.231 +# the sjavac server log files.
1.232 +SJAVAC_SERVER_DIR:=@SJAVAC_SERVER_DIR@
1.233 # We can block the Javac server to never use more cores than this.
1.234 # This is not for performance reasons, but for memory usage, since each
1.235 # core requires its own JavaCompiler. We might have 64 cores and 4GB
1.236 # of memory, 64 JavaCompilers will currently not fit in a 3GB heap.
1.237 # Since there is no sharing of data between the JavaCompilers.
1.238 -JAVAC_SERVER_CORES:=@JAVAC_SERVER_CORES@
1.239 -# Should we use dependency tracking between Java packages? true or false.
1.240 -JAVAC_USE_DEPS:=@JAVAC_USE_DEPS@
1.241 -# We can invoke javac: SINGLE_THREADED_BATCH or MULTI_CORE_CONCURRENT
1.242 -JAVAC_USE_MODE:=@JAVAC_USE_MODE@
1.243 -# Enable not yet complete sjavac support.
1.244 -ENABLE_SJAVAC:=@ENABLE_SJAVAC@
1.245 +SJAVAC_SERVER_CORES:=@SJAVAC_SERVER_CORES@
1.246
1.247 # The OpenJDK makefiles should be changed to using the standard
1.248 # configure output ..._CFLAGS and ..._LIBS. In the meantime we
1.249 @@ -280,7 +253,6 @@
1.250 FREETYPE2_LIBS:=@FREETYPE2_LIBS@
1.251 FREETYPE2_CFLAGS:=@FREETYPE2_CFLAGS@
1.252 USING_SYSTEM_FT_LIB=@USING_SYSTEM_FT_LIB@
1.253 -ALT_CUPS_HEADERS_PATH:=$(patsubst -I%,%,$(filter -I%,@CUPS_CFLAGS@))
1.254 CUPS_CFLAGS:=@CUPS_CFLAGS@
1.255
1.256 PACKAGE_PATH=@PACKAGE_PATH@
1.257 @@ -288,8 +260,6 @@
1.258 # Source file for cacerts
1.259 CACERTS_FILE=@CACERTS_FILE@
1.260
1.261 -#MOZILLA_HEADERS_PATH:=
1.262 -
1.263 # Necessary additional compiler flags to compile X11
1.264 X_CFLAGS:=@X_CFLAGS@
1.265 X_LIBS:=@X_LIBS@
1.266 @@ -338,7 +308,7 @@
1.267 CPP:=@UNCYGDRIVE@ @CPP@
1.268 #CPPFLAGS:=@CPPFLAGS@
1.269
1.270 -# The linker can be gcc or ld on posix systems, or link.exe on winapi systems.
1.271 +# The linker can be gcc or ld on posix systems, or link.exe on windows systems.
1.272 LD:=@UNCYGDRIVE@ @LD@
1.273
1.274 # LDFLAGS used to link the jdk native libraries (C-code)
1.275 @@ -353,6 +323,9 @@
1.276 LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
1.277 LDFLAGS_JDKEXE_SUFFIX:=@LDFLAGS_JDKEXE_SUFFIX@
1.278
1.279 +# LDFLAGS specific to C++ linking.
1.280 +LDFLAGS_CXX_JDK:=@LDFLAGS_CXX_JDK@
1.281 +
1.282 # Sometimes a different linker is needed for c++ libs
1.283 LDCXX:=@UNCYGDRIVE@ @LDCXX@
1.284 # The flags for linking libstdc++ linker.
1.285 @@ -361,28 +334,22 @@
1.286 # Sometimes a different linker is needed for c++ executables
1.287 LDEXECXX:=@UNCYGDRIVE@ @LDEXECXX@
1.288
1.289 -# If cross compiling, then define CROSS_COMPILE_ARCH:=cpu_name here.
1.290 -@DEFINE_CROSS_COMPILE_ARCH@
1.291 -# The HOSTCC should really be named BUILDCC, ie build executable for
1.292 -# the build platform. Same as CC when not cross compiling.
1.293 -HOSTCC:=@UNCYGDRIVE@ @HOSTCC@
1.294 -HOSTCXX:=@UNCYGDRIVE@ @HOSTCXX@
1.295 -# And of course, the jdk spells HOSTCC as NIO_CC/HOST_CC
1.296 -HOST_CC:=@UNCYGDRIVE@ @HOSTCC@
1.297 -NIO_CC:=@UNCYGDRIVE@ @HOSTCC@
1.298 -
1.299 -HOST_LD:=@UNCYGDRIVE@ @HOSTLD@
1.300 +# BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
1.301 +# build platform.
1.302 +BUILD_CC:=@UNCYGDRIVE@ @BUILD_CC@
1.303 +BUILD_LD:=@UNCYGDRIVE@ @BUILD_LD@
1.304
1.305 AS:=@UNCYGDRIVE@ @AS@
1.306 -ASFLAGS:=@ASFLAGS@
1.307
1.308 -# AR is used to create a static library (is ar in posix, lib.exe in winapi)
1.309 +# AR is used to create a static library (is ar in posix, lib.exe in windows)
1.310 AR:=@UNCYGDRIVE@ @AR@
1.311 ARFLAGS:=@ARFLAGS@
1.312
1.313 -NM:=@UNCYGDRIVE@ @NM@
1.314 -STRIP:=@UNCYGDRIVE@ @STRIP@
1.315 -MCS:=@UNCYGDRIVE@ @MCS@
1.316 +NM:=@NM@
1.317 +STRIP:=@STRIP@
1.318 +MCS:=@MCS@
1.319 +
1.320 +LIPO:=@LIPO@
1.321
1.322 # Command to create a shared library
1.323 SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@
1.324 @@ -414,6 +381,7 @@
1.325 # Set origin using the linker, ie use the relative path to the dependent library to find the dependees.
1.326 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
1.327 SET_SHARED_LIBRARY_ORIGIN=@SET_SHARED_LIBRARY_ORIGIN@
1.328 +SET_EXECUTABLE_ORIGIN=@SET_EXECUTABLE_ORIGIN@
1.329
1.330 # Different OS:es have different ways of naming shared libraries.
1.331 # The SHARED_LIBRARY macro takes "verify" as and argument and returns:
1.332 @@ -432,21 +400,20 @@
1.333
1.334 JAVA_FLAGS:=@BOOT_JDK_JVMARGS@
1.335
1.336 -JAVA=@UNCYGDRIVE@ @JAVA@ $(JAVA_FLAGS)
1.337 +JAVA=@UNCYGDRIVE@ $(BOOT_JDK)/bin/java $(JAVA_FLAGS)
1.338
1.339 -JAVAC:=@UNCYGDRIVE@ @JAVAC@
1.340 -JAVAC_FLAGS:=@JAVAC_FLAGS@
1.341 +JAVAC=@UNCYGDRIVE@ $(BOOT_JDK)/bin/javac
1.342 +# Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
1.343 +# overriding that value by using ?=.
1.344 +JAVAC_FLAGS?=@JAVAC_FLAGS@
1.345
1.346 -JAVAH:=@UNCYGDRIVE@ @JAVAH@
1.347 +JAVAH=@UNCYGDRIVE@ $(BOOT_JDK)/bin/javah
1.348
1.349 -JAR:=@UNCYGDRIVE@ @JAR@
1.350 +JAR=@UNCYGDRIVE@ $(BOOT_JDK)/bin/jar
1.351
1.352 -RMIC:=@UNCYGDRIVE@ @RMIC@
1.353 +RMIC=@UNCYGDRIVE@ $(BOOT_JDK)/bin/rmic
1.354
1.355 -NATIVE2ASCII:=@UNCYGDRIVE@ @NATIVE2ASCII@
1.356 -
1.357 -BOOT_JAR_CMD:=@UNCYGDRIVE@ @JAR@
1.358 -BOOT_JAR_JFLAGS:=
1.359 +NATIVE2ASCII=@UNCYGDRIVE@ $(BOOT_JDK)/bin/native2ascii
1.360
1.361 # Base flags for RC
1.362 # Guarding this against resetting value. Legacy make files include spec multiple
1.363 @@ -456,11 +423,12 @@
1.364 endif
1.365
1.366 # A specific java binary with specific options can be used to run
1.367 -# the long running background javac server and other long running tasks.
1.368 -SERVER_JAVA:=@UNCYGDRIVE@ @SERVER_JAVA@
1.369 +# the long running background sjavac servers and other long running tasks.
1.370 +SJAVAC_SERVER_JAVA:=@UNCYGDRIVE@ @SJAVAC_SERVER_JAVA@
1.371
1.372 # Tools adhering to a minimal and common standard of posix compliance.
1.373 AWK:=@AWK@
1.374 +BASENAME:=@BASENAME@
1.375 CAT:=@CAT@
1.376 CCACHE:=@CCACHE@
1.377 # CD is going away, but remains to cater for legacy makefiles.
1.378 @@ -520,8 +488,6 @@
1.379 BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
1.380
1.381 # Build setup
1.382 -ENABLE_DOCS:=@ENABLE_DOCS@
1.383 -GENERATE_DOCS:=@ENABLE_DOCS@
1.384 DISABLE_NIMBUS:=@DISABLE_NIMBUS@
1.385 ENABLE_JFR=@ENABLE_JFR@
1.386 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
1.387 @@ -561,17 +527,6 @@
1.388
1.389 ####################################################
1.390 #
1.391 -# Legacy Hotspot support
1.392 -
1.393 -HOTSPOT_DIST:=@HOTSPOT_DIST@
1.394 -HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@
1.395 -# This is used from the libjvm build for C/C++ code.
1.396 -HOTSPOT_BUILD_JOBS:=@CONCURRENT_BUILD_JOBS@
1.397 -# Control wether Hotspot runs Queens test after building
1.398 -TEST_IN_BUILD=@TEST_IN_BUILD@
1.399 -
1.400 -####################################################
1.401 -#
1.402 # INSTALLATION
1.403 #
1.404
1.405 @@ -634,5 +589,5 @@
1.406 OS_VERSION_MINOR:=@OS_VERSION_MINOR@
1.407 OS_VERSION_MICRO:=@OS_VERSION_MICRO@
1.408
1.409 -# Include the closed-spec.gmk file if it exists
1.410 --include $(dir @SPEC@)/closed-spec.gmk
1.411 +# Include the custom-spec.gmk file if it exists
1.412 +-include $(dir @SPEC@)/custom-spec.gmk
