Mercurial > hg > openjdk > aarch64-port
changeset 520:98a7af257bee
8003819: build-infra: backslashes at end of LIB and INCLUDE in spec.gmk
Summary: Removing trailing backslash from LIB and INCLUDE.
Reviewed-by: ohrstrom, ohair
author | erikj |
---|---|
date | Mon, 03 Dec 2012 10:26:55 +0100 |
parents | 13bb8c326e7b |
children | 754f91d22e1c |
files | common/autoconf/generated-configure.sh common/autoconf/toolchain_windows.m4 |
diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Wed Nov 28 14:03:53 2012 -0800 +++ b/common/autoconf/generated-configure.sh Mon Dec 03 10:26:55 2012 +0100 @@ -3672,7 +3672,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1354106772 +DATE_WHEN_GENERATED=1354526713 ############################################################################### # @@ -16434,8 +16434,9 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } - VS_INCLUDE="$INCLUDE" - VS_LIB="$LIB" + # Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk. + VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'` + VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'` VS_PATH="$PATH"
--- a/common/autoconf/toolchain_windows.m4 Wed Nov 28 14:03:53 2012 -0800 +++ b/common/autoconf/toolchain_windows.m4 Mon Dec 03 10:26:55 2012 +0100 @@ -200,8 +200,9 @@ AC_MSG_ERROR([Your VC command prompt seems broken, INCLUDE and/or LIB is missing.]) else AC_MSG_RESULT([ok]) - VS_INCLUDE="$INCLUDE" - VS_LIB="$LIB" + # Remove any trailing \ from INCLUDE and LIB to avoid trouble in spec.gmk. + VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'` + VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'` VS_PATH="$PATH" AC_SUBST(VS_INCLUDE) AC_SUBST(VS_LIB)