Skip to content

GitLab

Commit 3c5b7bc2 authored by yoogx's avatar yoogx
Browse files

* Solve link issue with PolyORB-HI/C C++ files

parent 1e625dca
Hide whitespace changes
Inline Side-by-side
share/make/Makefile.common.in
View file @ 3c5b7bc2
...@@ -202,7 +202,7 @@ check-linuxtaste: ...@@ -202,7 +202,7 @@ check-linuxtaste:
################################################################################ ################################################################################
# TASTE-RUNTIME-MONITORING # TASTE-RUNTIME-MONITORING
ifeq ($(MONITORING),true) ifeq ($(MONITORING), true)
MONITORING_OBJS = trace_manager.o remote_configuration.o MONITORING_OBJS = trace_manager.o remote_configuration.o
PO_HI_CPPOBJS += $(MONITORING_OBJS) PO_HI_CPPOBJS += $(MONITORING_OBJS)
...@@ -327,7 +327,7 @@ ifeq ($(TARGET), $(filter $(TARGET), native bench linux32 linux64)) ...@@ -327,7 +327,7 @@ ifeq ($(TARGET), $(filter $(TARGET), native bench linux32 linux64))
EXE=$(BINARY) EXE=$(BINARY)
$(BINARY): $(BINARY):
$(MAKE) generate-asn1-deployment target-objects compile-c-files compile-cpp-files compile-ada-files compile-po-hi $(USER_OBJS) $(GENERATED_OBJS) $(TARGET_OBJECTS) $(MAKE) generate-asn1-deployment target-objects compile-c-files compile-cpp-files compile-ada-files compile-po-hi $(USER_OBJS) $(GENERATED_OBJS) $(TARGET_OBJECTS)
$(LD) -o $(EXE) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS) $(LD) -o $(EXE) $(EXTERNAL_OBJECTS) $(PO_HI_OBJS) $(PO_HI_CPPOBJS) $(GENERATED_OBJS) $(USER_OBJS) $(LDFLAGS)
endif endif
ifeq ($(TARGET), $(filter $(TARGET), win32)) ifeq ($(TARGET), $(filter $(TARGET), win32))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment