From ae38130c3059c1a6751af39f782f51687249c8bf Mon Sep 17 00:00:00 2001
From: ohair <unknown>
Date: Tue, 4 Mar 2008 09:52:54 -0800
Subject: [PATCH] 6668781: Openjdk windows cygwin build failure: no rule to
 make linker_md.obj target Summary: Use of GNU make vpath breaks on windows
 with C:/ style fullpaths Reviewed-by: xdono

---
 make/common/Defs-linux.gmk   | 4 ++--
 make/common/Defs-solaris.gmk | 4 ++--
 make/common/Defs-windows.gmk | 6 +++---
 make/common/Defs.gmk         | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/make/common/Defs-linux.gmk b/make/common/Defs-linux.gmk
index 51d638f96..674b6f6a0 100644
--- a/make/common/Defs-linux.gmk
+++ b/make/common/Defs-linux.gmk
@@ -50,13 +50,13 @@ CC_DEPEND	 = -MM
 CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
 
 ifndef PLATFORM_SRC
-  PLATFORM_SRC = $(JDK_TOPDIR)/src/solaris
+  PLATFORM_SRC = $(BUILDDIR)/../src/solaris
 endif # PLATFORM_SRC
 
 # Platform specific closed sources
 ifndef OPENJDK
   ifndef CLOSED_PLATFORM_SRC
-    CLOSED_PLATFORM_SRC = $(JDK_TOPDIR)/src/closed/solaris
+    CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
   endif
 endif
 
diff --git a/make/common/Defs-solaris.gmk b/make/common/Defs-solaris.gmk
index 800c0b75d..052c0c88f 100644
--- a/make/common/Defs-solaris.gmk
+++ b/make/common/Defs-solaris.gmk
@@ -45,13 +45,13 @@
 include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
 
 ifndef PLATFORM_SRC
-PLATFORM_SRC = $(JDK_TOPDIR)/src/solaris
+PLATFORM_SRC = $(BUILDDIR)/../src/solaris
 endif # PLATFORM_SRC
 
 # Platform specific closed sources
 ifndef OPENJDK
   ifndef CLOSED_PLATFORM_SRC
-    CLOSED_PLATFORM_SRC = $(JDK_TOPDIR)/src/closed/solaris
+    CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
   endif
 endif
 
diff --git a/make/common/Defs-windows.gmk b/make/common/Defs-windows.gmk
index 6f53eb72f..e9bdea852 100644
--- a/make/common/Defs-windows.gmk
+++ b/make/common/Defs-windows.gmk
@@ -51,13 +51,13 @@ ifndef LIB_LOCATION
 endif # LIB_LOCATION
 
 ifndef PLATFORM_SRC
-  PLATFORM_SRC  = $(JDK_TOPDIR)/src/windows
+  PLATFORM_SRC  = $(BUILDDIR)/../src/windows
 endif # PLATFORM_SRC
 
 # Platform specific closed sources
 ifndef OPENJDK
   ifndef CLOSED_PLATFORM_SRC
-    CLOSED_PLATFORM_SRC  = $(JDK_TOPDIR)/src/closed/windows
+    CLOSED_PLATFORM_SRC  = $(BUILDDIR)/../src/closed/windows
   endif
 endif
 
@@ -367,7 +367,7 @@ else
 endif
 
 # Settings for the VERSIONINFO tap on windows. 
-VERSIONINFO_RESOURCE = $(JDK_TOPDIR)/src/windows/resource/version.rc
+VERSIONINFO_RESOURCE = $(BUILDDIR)/../src/windows/resource/version.rc
 
 ifneq ($(JDK_BUILD_NUMBER),)
  COOKED_BUILD_NUMBER = $(shell $(ECHO) $(JDK_BUILD_NUMBER) | $(SED) -e 's/^b//' -e 's/^0//')
diff --git a/make/common/Defs.gmk b/make/common/Defs.gmk
index 9dd781b2f..604874438 100644
--- a/make/common/Defs.gmk
+++ b/make/common/Defs.gmk
@@ -59,13 +59,13 @@ include $(JDK_TOPDIR)/make/common/CancelImplicits.gmk
 # there yet.
 #
 ifndef SHARE_SRC
-  SHARE_SRC    = $(JDK_TOPDIR)/src/share
+  SHARE_SRC    = $(BUILDDIR)/../src/share
 endif
 
 # Files that cannot be included in the OpenJDK distribution are
 # collected under a parent directory which contains just those files.
 ifndef CLOSED_SRC
-  CLOSED_SRC  = $(JDK_TOPDIR)/src/closed
+  CLOSED_SRC  = $(BUILDDIR)/../src/closed
 endif
 
 # If we have no closed directory, force it to an openjdk build
-- 
GitLab