From e6e260d8cabed67e8df0cabb5b8c504483460df8 Mon Sep 17 00:00:00 2001 From: Martin Mueller <72937414+mmarti04@users.noreply.github.com> Date: Thu, 30 Jan 2025 09:44:36 +0100 Subject: [PATCH] remove cross-compiler option in the case of compiling the detector server on the detector module CPU (#1078) Co-authored-by: Martin Mueller --- slsDetectorServers/xilinx_ctbDetectorServer/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/Makefile b/slsDetectorServers/xilinx_ctbDetectorServer/Makefile index 06a4d986d..c271efdfe 100755 --- a/slsDetectorServers/xilinx_ctbDetectorServer/Makefile +++ b/slsDetectorServers/xilinx_ctbDetectorServer/Makefile @@ -7,7 +7,12 @@ support_lib = ../../slsSupportLib/include/ det_lib = ../../slsDetectorSoftware/include/sls/ md5_dir = ../../slsSupportLib/src/ -CROSS = aarch64-none-linux-gnu- +ifeq ($(shell uname -m),aarch64) + # no cross compilation needed when on aarch64 + CROSS = +else + CROSS = aarch64-none-linux-gnu- +endif CC = $(CROSS)gcc #TODO: allow these warnings and fix code CFLAGS += -Wall -std=gnu99 -Wno-format-overflow -Wno-format-truncation -DXILINX_CHIPTESTBOARDD -DARMPROCESSOR -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE