Changeset 12

Timestamp:

Jun 8, 2010, 4:19:58 PM (15 years ago)

Author:

dmik

Message:

jdk/make/os2: Add the required GCC version check and a couple of other fixes.

Location:

trunk/openjdk/jdk/make/common/shared

Files:

• Compiler-gcc.gmk (modified) (1 diff)
• Sanity-Settings.gmk (modified) (2 diffs)
• Sanity.gmk (modified) (1 diff)

trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk

@@ -53 +53 @@
   _LINK_VER :=$(shell $(LINK) 2>&1 | $(HEAD) -n 1)
   LINK_VER  :=$(call GetVersion,"$(_LINK_VER)")
+
+endif
+
+ifeq ($(PLATFORM), os2)
+
+  # Settings specific to OS/2
+  CC           = $(COMPILER_PATH)gcc
+  CPP          = $(COMPILER_PATH)gcc -E
+  CXX          = $(COMPILER_PATH)g++
+  REQUIRED_CC_VER = 3.2
 
 endif

trunk/openjdk/jdk/make/common/shared/Sanity-Settings.gmk

@@ -103 +103 @@
   ALL_SETTINGS+=$(call addAltSetting,MSDEVTOOLS_PATH)
 else
+ifeq ($(PLATFORM),os2)
+else
   ALL_SETTINGS+=$(call addAltSetting,MOTIF_DIR)
   ALL_SETTINGS+=$(call addOptionalSetting,MOTIF_REQUIRED)
+endif
 endif
 ALL_SETTINGS+=$(call addOptionalSetting,COMPILER_NAME)
@@ -260 +263 @@
   ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_PATH)
   ALL_SETTINGS+=$(call addAltSetting,BUILD_BINARY_PLUGS_PATH)
-else 
+else
   ALL_SETTINGS+=$(call addHeading,OPENJDK Export Binary Plug Settings)
   ALL_SETTINGS+=$(call addOptionalSetting,PLUG_EXPORT_DIRNAME)

trunk/openjdk/jdk/make/common/shared/Sanity.gmk

@@ -845 +845 @@
 ######################################################
 sane-cups:
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows os2,$(PLATFORM)),)
         @if [ ! -r $(CUPS_HEADERS_PATH)/cups/cups.h ]; then \
           $(ECHO) "ERROR: You do not have access to valid Cups header files. \n" \