diff options
| author | dholmes <none@none> | 2013-03-14 01:41:20 -0400 |
|---|---|---|
| committer | dholmes <none@none> | 2013-03-14 01:41:20 -0400 |
| commit | 19fd30db4452244274cfa607591a5b17c0c8c5b5 (patch) | |
| tree | 424b02527b73f939c8e4a9413489654aea904874 | |
| parent | ebc474c1861c4dd1b3d63720d2e5feb2800193d0 (diff) | |
8009428: Revert changes to $ substitution performed as part of nashorn integration
Reviewed-by: alanb, erikj
| -rw-r--r-- | common/makefiles/MakeBase.gmk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/common/makefiles/MakeBase.gmk b/common/makefiles/MakeBase.gmk index 4c1ecc8..708cbad 100644 --- a/common/makefiles/MakeBase.gmk +++ b/common/makefiles/MakeBase.gmk @@ -51,9 +51,8 @@ decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely- -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 |