提交 ae38130c 编写于 作者: O ohair

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
上级 3e9f58c1
...@@ -50,13 +50,13 @@ CC_DEPEND = -MM ...@@ -50,13 +50,13 @@ CC_DEPEND = -MM
CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g' CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
ifndef PLATFORM_SRC ifndef PLATFORM_SRC
PLATFORM_SRC = $(JDK_TOPDIR)/src/solaris PLATFORM_SRC = $(BUILDDIR)/../src/solaris
endif # PLATFORM_SRC endif # PLATFORM_SRC
# Platform specific closed sources # Platform specific closed sources
ifndef OPENJDK ifndef OPENJDK
ifndef CLOSED_PLATFORM_SRC ifndef CLOSED_PLATFORM_SRC
CLOSED_PLATFORM_SRC = $(JDK_TOPDIR)/src/closed/solaris CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
endif endif
endif endif
......
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
include $(JDK_MAKE_SHARED_DIR)/Defs.gmk include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
ifndef PLATFORM_SRC ifndef PLATFORM_SRC
PLATFORM_SRC = $(JDK_TOPDIR)/src/solaris PLATFORM_SRC = $(BUILDDIR)/../src/solaris
endif # PLATFORM_SRC endif # PLATFORM_SRC
# Platform specific closed sources # Platform specific closed sources
ifndef OPENJDK ifndef OPENJDK
ifndef CLOSED_PLATFORM_SRC ifndef CLOSED_PLATFORM_SRC
CLOSED_PLATFORM_SRC = $(JDK_TOPDIR)/src/closed/solaris CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris
endif endif
endif endif
......
...@@ -51,13 +51,13 @@ ifndef LIB_LOCATION ...@@ -51,13 +51,13 @@ ifndef LIB_LOCATION
endif # LIB_LOCATION endif # LIB_LOCATION
ifndef PLATFORM_SRC ifndef PLATFORM_SRC
PLATFORM_SRC = $(JDK_TOPDIR)/src/windows PLATFORM_SRC = $(BUILDDIR)/../src/windows
endif # PLATFORM_SRC endif # PLATFORM_SRC
# Platform specific closed sources # Platform specific closed sources
ifndef OPENJDK ifndef OPENJDK
ifndef CLOSED_PLATFORM_SRC ifndef CLOSED_PLATFORM_SRC
CLOSED_PLATFORM_SRC = $(JDK_TOPDIR)/src/closed/windows CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/windows
endif endif
endif endif
...@@ -367,7 +367,7 @@ else ...@@ -367,7 +367,7 @@ else
endif endif
# Settings for the VERSIONINFO tap on windows. # 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),) ifneq ($(JDK_BUILD_NUMBER),)
COOKED_BUILD_NUMBER = $(shell $(ECHO) $(JDK_BUILD_NUMBER) | $(SED) -e 's/^b//' -e 's/^0//') COOKED_BUILD_NUMBER = $(shell $(ECHO) $(JDK_BUILD_NUMBER) | $(SED) -e 's/^b//' -e 's/^0//')
......
...@@ -59,13 +59,13 @@ include $(JDK_TOPDIR)/make/common/CancelImplicits.gmk ...@@ -59,13 +59,13 @@ include $(JDK_TOPDIR)/make/common/CancelImplicits.gmk
# there yet. # there yet.
# #
ifndef SHARE_SRC ifndef SHARE_SRC
SHARE_SRC = $(JDK_TOPDIR)/src/share SHARE_SRC = $(BUILDDIR)/../src/share
endif endif
# Files that cannot be included in the OpenJDK distribution are # Files that cannot be included in the OpenJDK distribution are
# collected under a parent directory which contains just those files. # collected under a parent directory which contains just those files.
ifndef CLOSED_SRC ifndef CLOSED_SRC
CLOSED_SRC = $(JDK_TOPDIR)/src/closed CLOSED_SRC = $(BUILDDIR)/../src/closed
endif endif
# If we have no closed directory, force it to an openjdk build # If we have no closed directory, force it to an openjdk build
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册