From 2eb2fa34212754e5700f2fbcbbf1c418a516e89a Mon Sep 17 00:00:00 2001 From: keenanlang Date: Sun, 7 Jan 2024 21:03:45 -0600 Subject: [PATCH 1/2] Use OS_CLASS and ARCH_CLASS --- andorSupport/Makefile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/andorSupport/Makefile b/andorSupport/Makefile index 7a8fe0d..c6ddc5a 100755 --- a/andorSupport/Makefile +++ b/andorSupport/Makefile @@ -21,20 +21,21 @@ else ifeq (windows-x64, $(findstring windows-x64, $(T_A))) LIB_INSTALLS_WIN32 += ../os/windows-x64/atmcd64m.lib LIB_INSTALLS_WIN32 += ../os/windows-x64/ShamrockCIFm.lib -else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A))) -LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so.2 -LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so -LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so.2 -LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so +else ifeq ($(OS_CLASS), Linux) + ifeq ($(ARCH_CLASS), x86_64) + LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so.2 + LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so + LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so.2 + LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so -else ifeq (linux-x86, $(findstring linux-x86, $(T_A))) -LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so.2 -LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so -LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so.2 -LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so + else + LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so.2 + LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so + LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so.2 + LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so + endif endif - #============================= include $(TOP)/configure/RULES From 2722b7240e2afdab97c1fa53a6d06d5c69bf11b5 Mon Sep 17 00:00:00 2001 From: keenanlang Date: Sun, 7 Jan 2024 21:12:47 -0600 Subject: [PATCH 2/2] Specify x86 to avoid linux-arm --- andorSupport/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/andorSupport/Makefile b/andorSupport/Makefile index c6ddc5a..3f9a91b 100755 --- a/andorSupport/Makefile +++ b/andorSupport/Makefile @@ -28,7 +28,7 @@ else ifeq ($(OS_CLASS), Linux) LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so.2 LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so - else + else ifeq ($(ARCH_CLASS), x86) LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so.2 LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so.2