Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Wed, 09 Apr 2014 17:16:00 -0700
changeset 23434 b2f6298d8b23
parent 23431 01d2d284ae09 (current diff)
parent 23433 afe67de12b7d (diff)
child 23435 098340eccdcb
Merge
--- a/common/autoconf/generated-configure.sh	Wed Apr 09 09:19:42 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Wed Apr 09 17:16:00 2014 -0700
@@ -4243,7 +4243,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1396297437
+DATE_WHEN_GENERATED=1396624161
 
 ###############################################################################
 #
@@ -27449,6 +27449,9 @@
       VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
       WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'`
       WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
+      # Remove any paths containing # (typically F#) as that messes up make. This
+      # is needed if visual studio was installed with F# support.
+      VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[^:#]*#[^:]*://g'`
 
 
 
--- a/common/autoconf/toolchain_windows.m4	Wed Apr 09 09:19:42 2014 -0700
+++ b/common/autoconf/toolchain_windows.m4	Wed Apr 09 17:16:00 2014 -0700
@@ -211,6 +211,9 @@
       VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
       WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'`
       WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
+      # Remove any paths containing # (typically F#) as that messes up make. This
+      # is needed if visual studio was installed with F# support.
+      VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'`
 
       AC_SUBST(VS_PATH)
       AC_SUBST(VS_INCLUDE)
--- a/make/common/NativeCompilation.gmk	Wed Apr 09 09:19:42 2014 -0700
+++ b/make/common/NativeCompilation.gmk	Wed Apr 09 17:16:00 2014 -0700
@@ -482,7 +482,7 @@
             # to be rebuilt properly.
             $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET)
 		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_DEBUGINFO_FILES)
+		&& $(ZIP) -q $$@ $$(notdir $$($1_DEBUGINFO_FILES))
 
           else
             $1 += $$(subst $$($1_OBJECT_DIR),$$($1_OUTPUT_DIR),$$($1_DEBUGINFO_FILES))
jdk-sandbox