From 1e9a2e1e0ca3659608af1778068cf78a212e9573 Mon Sep 17 00:00:00 2001 From: Pherring04 Date: Mon, 6 Jan 2025 15:31:56 -0600 Subject: [PATCH] CI --- share/trick/makefiles/trickify.mk | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/share/trick/makefiles/trickify.mk b/share/trick/makefiles/trickify.mk index 421ca518..a56fd85d 100644 --- a/share/trick/makefiles/trickify.mk +++ b/share/trick/makefiles/trickify.mk @@ -106,10 +106,23 @@ BUILD_DIR := $(dir $(MAKE_OUT)) PY_LINK_LIST := $(BUILD_DIR)trickify_py_link_list IO_LINK_LIST := $(BUILD_DIR)trickify_io_link_list OBJ_LINK_LIST := trickify_obj_list +UNAME := $(shell uname) ifdef FULL_TRICKIFY_BUILD - LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) @$(OBJ_LINK_LIST) + ifeq ($(UNAME), Linux) + LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) @$(OBJ_LINK_LIST) + else ifeq ($(UNAME), Darwin) + LINK_LISTS := $(IO_LINK_LIST) $(PY_LINK_LIST) $(OBJ_LINK_LIST) + else + LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) @$(OBJ_LINK_LIST) + endif else - LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) + ifeq ($(UNAME), Linux) + LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) + else ifeq ($(UNAME), Darwin) + LINK_LISTS := $(IO_LINK_LIST) $(PY_LINK_LIST) + else + LINK_LISTS := @$(IO_LINK_LIST) @$(PY_LINK_LIST) + endif endif ifneq ($(wildcard $(BUILD_DIR)),) SWIG_OBJECTS := $(shell cat $(PY_LINK_LIST)) @@ -122,7 +135,6 @@ TRICK_CXXFLAGS += $(TRICKIFY_CXX_FLAGS) # Ensure we can process all headers TRICK_EXT_LIB_DIRS := $(TRICKIFY_EXT_LIB_DIRS) -UNAME := $(shell uname) ifeq ($(UNAME), Linux) SHARED_OPTIONS := -fPIC else ifeq ($(UNAME), Darwin)