mirror of
https://github.com/nasa/trick.git
synced 2025-02-01 16:57:59 +00:00
CI
This commit is contained in:
parent
fc964811b9
commit
1e9a2e1e0c
@ -106,10 +106,23 @@ BUILD_DIR := $(dir $(MAKE_OUT))
|
|||||||
PY_LINK_LIST := $(BUILD_DIR)trickify_py_link_list
|
PY_LINK_LIST := $(BUILD_DIR)trickify_py_link_list
|
||||||
IO_LINK_LIST := $(BUILD_DIR)trickify_io_link_list
|
IO_LINK_LIST := $(BUILD_DIR)trickify_io_link_list
|
||||||
OBJ_LINK_LIST := trickify_obj_list
|
OBJ_LINK_LIST := trickify_obj_list
|
||||||
|
UNAME := $(shell uname)
|
||||||
ifdef FULL_TRICKIFY_BUILD
|
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
|
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
|
endif
|
||||||
ifneq ($(wildcard $(BUILD_DIR)),)
|
ifneq ($(wildcard $(BUILD_DIR)),)
|
||||||
SWIG_OBJECTS := $(shell cat $(PY_LINK_LIST))
|
SWIG_OBJECTS := $(shell cat $(PY_LINK_LIST))
|
||||||
@ -122,7 +135,6 @@ TRICK_CXXFLAGS += $(TRICKIFY_CXX_FLAGS)
|
|||||||
# Ensure we can process all headers
|
# Ensure we can process all headers
|
||||||
TRICK_EXT_LIB_DIRS := $(TRICKIFY_EXT_LIB_DIRS)
|
TRICK_EXT_LIB_DIRS := $(TRICKIFY_EXT_LIB_DIRS)
|
||||||
|
|
||||||
UNAME := $(shell uname)
|
|
||||||
ifeq ($(UNAME), Linux)
|
ifeq ($(UNAME), Linux)
|
||||||
SHARED_OPTIONS := -fPIC
|
SHARED_OPTIONS := -fPIC
|
||||||
else ifeq ($(UNAME), Darwin)
|
else ifeq ($(UNAME), Darwin)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user