This repository was archived by the owner on Nov 22, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 65
65
- name : Build the platform libraries (make lib)
66
66
if : steps.check-sha.outputs.cache-hit != 'true'
67
67
shell : cmd
68
- run : make lib QUIET=1 SHELL=cmd
69
- # make -j2 lib fails with SHELL=cmd (not sure why)
68
+ run : make -j2 lib QUIET=1 SHELL=cmd
70
69
71
70
- name : Run the regression tests (make test)
72
71
if : steps.check-sha.outputs.cache-hit != 'true'
Original file line number Diff line number Diff line change @@ -122,9 +122,13 @@ endef # ZIP_recipe
122
122
zip :
123
123
$(foreach dir,$(OUTPUTDIRS ) ,$(ZIP_recipe ) )
124
124
125
- $(TARGETS ) :
125
+ $(TARGETS ) : | ../lib
126
126
@$(MAKE ) --no-print-directory $@
127
127
128
+ # ../lib must be created globally before doing lib targets in parallel
129
+ ../lib :
130
+ @$(call MKDIR,$@ )
131
+
128
132
else # TARGET
129
133
130
134
CA65FLAGS =
@@ -293,10 +297,12 @@ $(EXTRA_OBJPAT): $(EXTRA_SRCPAT) | ../libwrk/$(TARGET) ../lib
293
297
@echo $(TARGET ) - $(<F )
294
298
@$(CA65 ) -t $(TARGET ) $(CA65FLAGS ) --create-dep $(@:../lib/%.o=../libwrk/$(TARGET ) /%.d ) -o $@ $<
295
299
300
+ $(EXTRA_OBJS ) : | ../lib
301
+
296
302
../lib/$(TARGET ) .lib : $(OBJS ) | ../lib
297
303
$(AR65 ) a $@ $?
298
304
299
- ../libwrk/$(TARGET ) ../lib ../ target/$(TARGET ) /util :
305
+ ../libwrk/$(TARGET ) ../target/$(TARGET ) /util :
300
306
@$(call MKDIR,$@ )
301
307
302
308
$(TARGET ) : $(EXTRA_OBJS ) ../lib/$(TARGET ) .lib
You can’t perform that action at this time.
0 commit comments