Changeset 27 for trunk/openjdk/Makefile

Timestamp:

Jun 17, 2010, 4:08:35 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Integrate Odin SDK to the compiler/linker definitions and require a valid path to it to be set.

File:

• trunk/openjdk/Makefile (modified) (9 diffs)

trunk/openjdk/Makefile

@@ -116 +116 @@
 endif
 
-build:: sanity 
+build:: sanity
 
 clobber::
@@ -141 +141 @@
 
 ifeq ($(BUILD_HOTSPOT), true)
-  build:: $(HOTSPOT) 
+  build:: $(HOTSPOT)
   clobber:: hotspot-clobber
 endif
@@ -168 +168 @@
 #   ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
 #   The resulting j2sdk-image is used by the install makefiles to create a
-#     debug install bundle jdk-*-debug-** bundle (tar or zip) 
+#     debug install bundle jdk-*-debug-** bundle (tar or zip)
 #     which will install in the debug or fastdebug subdirectory of the
 #     normal product install area.
@@ -281 +281 @@
         @$(ECHO) "================================================="
         @$(ECHO) " "
-    
+
     endif
   endif
@@ -294 +294 @@
 clean: clobber
 
-all:: 
+all::
         @$(ECHO) Control build finished: `$(DATE) '+%y-%m-%d %H:%M'`
 
@@ -384 +384 @@
 MSDEVTOOLS_PATH.desc       = Root directory of VC++ tools (e.g. rc.exe)
 MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
+ODINSDK_PATH.desc          = Root directory of Odin32 SDK (OS/2)
 
 # Make variables to print out (description and value)
@@ -402 +403 @@
     JDK_IMPORT_PATH             \
     COMPILER_PATH               \
-    DEVTOOLS_PATH 
+    DEVTOOLS_PATH
 
 # Make variables that should refer to files that exist
@@ -420 +421 @@
     MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
+
+endif
+
+# Some are OS/2 specific
+ifeq ($(PLATFORM), os2)
+
+VARIABLE_PRINTVAL_LIST +=       \
+    ODINSDK_PATH
+
+VARIABLE_CHECKDIR_LIST +=       \
+    ODINSDK_PATH
 
 endif
@@ -483 +495 @@
 # Cycle build. Build the jdk, use it to build the jdk again.
 ################################################################
-  
+
 ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
-  
+
 boot_cycle:
         $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) product_build