Changeset 196 for trunk

Timestamp:

Dec 8, 2010, 1:33:59 AM (15 years ago)

Author:

dmik

Message:

jdk/make: Make the PLATFORM_SRC_OS2 public.

Location:

trunk/openjdk/jdk/make/common

Files:

• Defs-os2.gmk (modified) (1 diff)
• Library.gmk (modified) (1 diff)

trunk/openjdk/jdk/make/common/Defs-os2.gmk

@@ -53 +53 @@
   PLATFORM_SRC  = $(BUILDDIR)/../src/windows
 endif # PLATFORM_SRC
+
+ifndef PLATFORM_SRC_OS2
+  # OS/2 is based on Odin32 so PLATFORM_SRC is 'windows'. But in some cases we
+  # provide the native bits and need to refer to a separate 'os2' soorce tree
+  PLATFORM_SRC_OS2 = $(PLATFORM_SRC:%/windows=%/os2)
+endif
+
+ifeq ($(PLATFORM_SRC), $(PLATFORM_SRC_OS2))
+  $(error Both PLATFORM_SRC and PLATFORM_SRC_OS2 are '$(PLATFOROM_SRC)'!)
+endif
 
 # Platform specific closed sources

trunk/openjdk/jdk/make/common/Library.gmk

@@ -329 +329 @@
 
 ifeq ($(PLATFORM), os2)
-# OS/2 is based on Odin32 so PLATFORM_SRC is 'windows'. But in some cases we
-# provide the native implementations so the 'os2' vpath should come first
-PLATFORM_SRC_OS2 = $(PLATFORM_SRC:%/windows=%/os2)
-ifeq ($(PLATFORM_SRC), $(PLATFORM_SRC_OS2))
-  $(error Both PLATFORM_SRC and PLATFORM_SRC_OS2 are '$(PLATFOROM_SRC)'!)
-endif
+# OS/2 specific vpath should come first
 vpath %.c $(PLATFORM_SRC_OS2)/native/$(PKGDIR)
 OTHER_INCLUDES += -I$(PLATFORM_SRC_OS2)/native/common