workflow update

pull/492/head
sfeakes 2025-11-21 11:36:56 -06:00
parent 3b0b7b1a8c
commit 535359da9f
2 changed files with 8 additions and 3 deletions

View File

@ -68,7 +68,7 @@ jobs:
# Using a standard 'run' block as we are already inside the container
run: |
make clean && \
make SYSR_ARMHF=${{ env.GLIBC_SYSR_ARMHF }} buildrelease
make SYSR_ARMHF=${{ env.GLIBC_SYSR_ARMHF }} LDR_PATH_ARMHF="/usr/lib/arm-linux-gnueabihf" buildrelease
# The remaining steps automatically run inside the container as well

View File

@ -17,10 +17,15 @@ AQ_MANAGER = true
# The value is empty if not passed via the command line.
SYSR_ARMHF ?=
SYSR_ARM64 ?=
LDR_PATH_ARMHF ?=
LDR_PATH_ARM64 ?=
# If SYSR_ARMHF is empty, the --sysroot flag will be empty,
SYSR_ARMHF_FLAG = $(if $(SYSR_ARMHF), --sysroot=$(SYSR_ARMHF),)
SYSR_ARM64_FLAG = $(if $(SYSR_ARM64), --sysroot=$(SYSR_ARM64),)
LDR_PATH_ARMHF_FLAG = $(if $(LDR_PATH_ARMHF), -L$(LDR_PATH_ARMHF),)
LDR_PATH_ARM64_FLAG = $(if $(LDR_PATH_ARM64), -L$(LDR_PATH_ARM64),)
#AQ_CONTAINER = false // this is for compiling for containers
# define the C compiler(s) to use
@ -340,10 +345,10 @@ $(MAIN_ARM64): $(OBJ_FILES_ARM64)
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LIBS)
$(MAIN_ARMHF): $(OBJ_FILES_ARMHF)
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LIBS) $(SYSR_ARMHF_FLAG)
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LIBS) $(SYSR_ARMHF_FLAG) $(LDR_PATH_ARMHF_FLAG)
$(MAIN_AMD64): $(OBJ_FILES_AMD64)
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LIBS) $(SYSR_ARM64_FLAG)
$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LIBS) $(SYSR_ARM64_FLAG) $(LDR_PATH_ARM64_FLAG)
$(DEBG): $(DBG_OBJ_FILES)
$(CC) $(DBG_CFLAGS) $(INCLUDES) -o $@ $^ $(LIBS)