ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-20 05:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trickify MAC fixes

Browse Source
This commit is contained in:
Pherring04 2024-12-03 10:51:03 -06:00
parent 5960500630
commit ffb2e34240
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/trick/makefiles/trickify.mk
View File

@ -126,7 +126,7 @@ UNAME := $(shell uname)
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
SHARED_OPTIONS := -shared SHARED_OPTIONS := -shared
else ifeq ($(UNAME), Darwin) else ifeq ($(UNAME), Darwin)
SHARED_OPTIONS := -dynamiclib SHARED_OPTIONS := -dynamiclib -fPIC
else else
SHARED_OPTIONS := -shared SHARED_OPTIONS := -shared
endif endif
@ -135,12 +135,16 @@ endif
all: $(TRICKIFY_OBJECT_NAME) $(TRICKIFY_PYTHON_DIR) all: $(TRICKIFY_OBJECT_NAME) $(TRICKIFY_PYTHON_DIR)
$(TRICKIFY_OBJECT_NAME): $(SWIG_OBJECTS) $(IO_OBJECTS) | $(dir $(TRICKIFY_OBJECT_NAME)) $(TRICKIFY_OBJECT_NAME): $(SWIG_OBJECTS) $(IO_OBJECTS) | $(dir $(TRICKIFY_OBJECT_NAME))
echo "Enterting trickify.mk"
$(info $(call COLOR,Linking) $@) $(info $(call COLOR,Linking) $@)
ifeq ($(TRICKIFY_BUILD_TYPE),PLO) ifeq ($(TRICKIFY_BUILD_TYPE),PLO)
echo "Building PLO"
$(call ECHO_AND_LOG,$(LD) $(LD_PARTIAL) -o $@ $(LINK_LISTS)) $(call ECHO_AND_LOG,$(LD) $(LD_PARTIAL) -o $@ $(LINK_LISTS))
else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED) else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED)
echo "Building SHARED"
$(call ECHO_AND_LOG,$(TRICK_CXX) $(SHARED_OPTIONS) -o $@ $(LINK_LISTS)) $(call ECHO_AND_LOG,$(TRICK_CXX) $(SHARED_OPTIONS) -o $@ $(LINK_LISTS))
else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC) else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
echo "Building STATIC"
$(call ECHO_AND_LOG,ar rcs $@ $(LINK_LISTS)) $(call ECHO_AND_LOG,ar rcs $@ $(LINK_LISTS))
endif endif