Skip to content

Commit a1bd2f5

Browse files
committed
Workaround for NMake
NMake cannot parse macro expansion in LHS of replacement. ``` fatal error U1005: syntax error : text must follow ':' in macro ```
1 parent 1f762e1 commit a1bd2f5

1 file changed

Lines changed: 28 additions & 26 deletions

File tree

common.mk

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,33 @@ MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
8585

8686
PRISM_BUILD_DIR = prism
8787

88-
PRISM_FILES = prism/api_node.$(OBJEXT) \
89-
prism/api_pack.$(OBJEXT) \
90-
prism/diagnostic.$(OBJEXT) \
91-
prism/encoding.$(OBJEXT) \
92-
prism/extension.$(OBJEXT) \
93-
prism/node.$(OBJEXT) \
94-
prism/options.$(OBJEXT) \
95-
prism/pack.$(OBJEXT) \
96-
prism/prettyprint.$(OBJEXT) \
97-
prism/regexp.$(OBJEXT) \
98-
prism/serialize.$(OBJEXT) \
99-
prism/static_literals.$(OBJEXT) \
100-
prism/token_type.$(OBJEXT) \
101-
prism/util/pm_buffer.$(OBJEXT) \
102-
prism/util/pm_char.$(OBJEXT) \
103-
prism/util/pm_constant_pool.$(OBJEXT) \
104-
prism/util/pm_integer.$(OBJEXT) \
105-
prism/util/pm_list.$(OBJEXT) \
106-
prism/util/pm_memchr.$(OBJEXT) \
107-
prism/util/pm_newline_list.$(OBJEXT) \
108-
prism/util/pm_string.$(OBJEXT) \
109-
prism/util/pm_strncasecmp.$(OBJEXT) \
110-
prism/util/pm_strpbrk.$(OBJEXT) \
111-
prism/prism.$(OBJEXT) \
112-
prism_init.$(OBJEXT)
88+
PRISM_SOURCES = prism/api_node.c \
89+
prism/api_pack.c \
90+
prism/diagnostic.c \
91+
prism/encoding.c \
92+
prism/extension.c \
93+
prism/node.c \
94+
prism/options.c \
95+
prism/pack.c \
96+
prism/prettyprint.c \
97+
prism/regexp.c \
98+
prism/serialize.c \
99+
prism/static_literals.c \
100+
prism/token_type.c \
101+
prism/util/pm_buffer.c \
102+
prism/util/pm_char.c \
103+
prism/util/pm_constant_pool.c \
104+
prism/util/pm_integer.c \
105+
prism/util/pm_list.c \
106+
prism/util/pm_memchr.c \
107+
prism/util/pm_newline_list.c \
108+
prism/util/pm_string.c \
109+
prism/util/pm_strncasecmp.c \
110+
prism/util/pm_strpbrk.c \
111+
prism/prism.c \
112+
prism_init.c
113+
114+
PRISM_FILES = $(PRISM_SOURCES:.c=.$(OBJEXT))
113115

114116
COMMONOBJS = \
115117
array.$(OBJEXT) \
@@ -361,7 +363,7 @@ programs: $(PROGRAM) $(WPROGRAM) $(arch)-fake.rb
361363
$(PREP): $(MKFILES)
362364

363365
miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(ARCHFILE)
364-
miniruby$(EXEEXT): $(PRISM_FILES:.$(OBJEXT)=.c) # for BSD make
366+
miniruby$(EXEEXT): $(PRISM_SOURCES) # for BSD make
365367

366368
objs: $(ALLOBJS)
367369

0 commit comments

Comments
 (0)