Mercurial > hg > openjdk > jigsaw
changeset 710:19a59a13b3ef
8009428: Revert changes to $ substitution performed as part of nashorn integration
Reviewed-by: alanb, erikj
author | dholmes |
---|---|
date | Thu, 14 Mar 2013 01:41:20 -0400 |
parents | b35d986ff276 |
children | 4984ac509993 |
files | common/makefiles/MakeBase.gmk |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common/makefiles/MakeBase.gmk Wed Mar 06 08:37:27 2013 -0800 +++ b/common/makefiles/MakeBase.gmk Thu Mar 14 01:41:20 2013 -0400 @@ -51,9 +51,8 @@ -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \ -e 's|X00|X|g' | tr '\n' '$2' -# Subst in an extra $ to prevent it from disappearing. define ListPathsSafely_If - $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(subst $$,$$$$,$(wordlist $3,$4,$($1)))))) + $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1))))) endef define ListPathsSafely_Printf