Skip to content

Commit 184db64

Browse files
committed
8255732: OpenJDK fails to build if $A is set to a value with spaces
Reviewed-by: ihse
1 parent c774741 commit 184db64

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

make/common/JavaCompilation.gmk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,11 @@ define SetupJavaCompilationBody
311311
ifneq ($$($1_KEEP_DUPS), true)
312312
# Remove duplicate source files by keeping the first found of each duplicate.
313313
# This allows for automatic overrides with custom or platform specific versions
314-
# source files.
314+
# source files. Need to call DoubleDollar as we have java classes with '$' in
315+
# their names.
315316
$1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \
316-
$$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \
317+
$$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), \
318+
$$(call DoubleDollar, $$(s)))) \
317319
$$(if $$($1_$$(relative_src)), \
318320
, \
319321
$$(eval $1_$$(relative_src) := 1) $$(s))))

0 commit comments

Comments
 (0)