8009428: Revert changes to $ substitution performed as part of nashorn integration

Thu, 14 Mar 2013 01:41:20 -0400

author
dholmes
date
Thu, 14 Mar 2013 01:41:20 -0400
changeset 660
19a59a13b3ef
parent 652
b35d986ff276
child 661
4984ac509993
child 887
b938d5ee29c3

8009428: Revert changes to $ substitution performed as part of nashorn integration
Reviewed-by: alanb, erikj

common/makefiles/MakeBase.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/common/makefiles/MakeBase.gmk	Wed Mar 06 08:37:27 2013 -0800
     1.2 +++ b/common/makefiles/MakeBase.gmk	Thu Mar 14 01:41:20 2013 -0400
     1.3 @@ -51,9 +51,8 @@
     1.4  		     -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
     1.5  		     -e 's|X00|X|g' | tr '\n' '$2'
     1.6  
     1.7 -# Subst in an extra $ to prevent it from disappearing.
     1.8  define ListPathsSafely_If
     1.9 -    $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(subst $$,$$$$,$(wordlist $3,$4,$($1))))))
    1.10 +    $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
    1.11  endef
    1.12  
    1.13  define ListPathsSafely_Printf

mercurial