CI

nasa · Jan 6, 2025 · fc96481 · fc96481
1 parent 2b4054f
commit fc96481
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/share/trick/makefiles/trickify.mk b/share/trick/makefiles/trickify.mk
@@ -141,6 +141,11 @@ ifeq ($(TRICKIFY_BUILD_TYPE),PLO)
 else ifeq ($(TRICKIFY_BUILD_TYPE),SHARED)
 	$(call ECHO_AND_LOG,$(TRICK_CXX) $(SHARED_LIB_OPT) $(SHARED_OPTIONS) -o $@ $(LINK_LISTS))
 else ifeq ($(TRICKIFY_BUILD_TYPE),STATIC)
+	@echo "-----Printing LS-----"
+	@ls
+	@echo "-----Printing LS build-----"
+	@ls build
+	@echo "-----Ending LS-----"
 	$(call ECHO_AND_LOG,ar rcs $@ $(LINK_LISTS))
 endif
 

diff --git a/test/SIM_trickified/trickified_project/trickified/Makefile b/test/SIM_trickified/trickified_project/trickified/Makefile
@@ -1,8 +1,8 @@
 PROJECT_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))/..)
 TRICK_HOME := $(abspath $(PROJECT_HOME)/../../..)
 
-export TRICKIFY_BUILD_TYPE := STATIC
-export TRICKIFY_OBJECT_NAME := trickified_myproject.a
+export TRICKIFY_BUILD_TYPE := PLO
+export TRICKIFY_OBJECT_NAME := trickified_myproject.o
 export TRICKIFY_CXX_FLAGS := -I$(PROJECT_HOME)/include -I$(TRICK_HOME)/include
 
 all:

diff --git a/test/SIM_trickified/trickified_project/trickified/myproject.mk b/test/SIM_trickified/trickified_project/trickified/myproject.mk
@@ -11,7 +11,7 @@ MYPROJECT_INCLUDE := -I$(MYPROJECT_HOME)/include
 TRICK_CFLAGS   += $(MYPROJECT_INCLUDE) $(MYPROJECT_SOURCE)
 TRICK_CXXFLAGS += $(MYPROJECT_INCLUDE) $(MYPROJECT_SOURCE)
 
-MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/trickified_myproject.a
+MYPROJECT_TRICK := $(MYPROJECT_HOME)/trickified/trickified_myproject.o
 
 # Tell Trick the headers and source at this location are part of a
 # Trickified project