OpenJDK / amber / amber
changeset 30:7ea1edf98bfe
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
| author | ohair |
|---|---|
| date | Tue, 04 Mar 2008 09:52:54 -0800 |
| parents | b8bedccd805d |
| children | a8fdfca90643 |
| files | jdk/make/common/Defs-linux.gmk jdk/make/common/Defs-solaris.gmk jdk/make/common/Defs-windows.gmk jdk/make/common/Defs.gmk |
| diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/common/Defs-linux.gmk Tue Mar 04 09:51:25 2008 -0800 +++ b/jdk/make/common/Defs-linux.gmk Tue Mar 04 09:52:54 2008 -0800 @@ -50,13 +50,13 @@ 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
--- a/jdk/make/common/Defs-solaris.gmk Tue Mar 04 09:51:25 2008 -0800 +++ b/jdk/make/common/Defs-solaris.gmk Tue Mar 04 09:52:54 2008 -0800 @@ -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
--- a/jdk/make/common/Defs-windows.gmk Tue Mar 04 09:51:25 2008 -0800 +++ b/jdk/make/common/Defs-windows.gmk Tue Mar 04 09:52:54 2008 -0800 @@ -51,13 +51,13 @@ 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 @@ 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//')
--- a/jdk/make/common/Defs.gmk Tue Mar 04 09:51:25 2008 -0800 +++ b/jdk/make/common/Defs.gmk Tue Mar 04 09:52:54 2008 -0800 @@ -59,13 +59,13 @@ # 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