From 64dd475a3af76b78c3ed6ef9282e556c69fb28c8 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Thu, 1 Feb 2024 21:08:45 +0100 Subject: [PATCH] [Faster CI] Make CI not run CC_CHECK (#1686) * Make CI not run CC_CHECK * I put it on the wrong step bruh * Introduce RUN_CC_CHECK instead (like MM) --- Jenkinsfile | 2 +- Makefile | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 423c865f4c..0cdc7c1bd2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ pipeline { } } steps { - sh 'make -j' + sh 'make -j RUN_CC_CHECK=0' } } stage('Report Progress') { diff --git a/Makefile b/Makefile index 22afead9e0..248895ed2f 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,8 @@ COMPILER := ido VERSION := gc-eu-mq-dbg # Number of threads to extract and compress with N_THREADS := $(shell nproc) +# Check code syntax with host compiler +RUN_CC_CHECK := 1 CFLAGS ?= CPPFLAGS ?= @@ -173,7 +175,7 @@ ifeq ($(COMPILER),ido) CC_CHECK += -m32 endif else - CC_CHECK = @: + RUN_CC_CHECK := 0 endif OBJDUMP_FLAGS := -d -r -z -Mreg-names=32 @@ -456,18 +458,24 @@ $(BUILD_DIR)/src/code/z_game_dlftbls.o: include/tables/gamestate_table.h $(BUILD_DIR)/src/code/z_scene_table.o: include/tables/scene_table.h include/tables/entrance_table.h $(BUILD_DIR)/src/%.o: src/%.c +ifneq ($(RUN_CC_CHECK),0) $(CC_CHECK) $< +endif $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) $(BUILD_DIR)/src/libultra/libc/ll.o: src/libultra/libc/ll.c +ifneq ($(RUN_CC_CHECK),0) $(CC_CHECK) $< +endif $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< $(PYTHON) tools/set_o32abi_bit.py $@ @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) $(BUILD_DIR)/src/libultra/libc/llcvt.o: src/libultra/libc/llcvt.c +ifneq ($(RUN_CC_CHECK),0) $(CC_CHECK) $< +endif $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $< $(PYTHON) tools/set_o32abi_bit.py $@ @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s)