Skip to content

Commit 87e2bfb

Browse files
committed
Updated makefiles (better cross-compilation support)
1 parent bda04d1 commit 87e2bfb

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ XOBJ_TEST = $(if $(OBJ_TEST),$(OBJ_TEST),$(OBJ_STUB))
9090
CXX_FILE = $(patsubst $(ARTIFACT_BIN)/%.o,%.cpp, $(@))
9191
DEP_FILE = $(patsubst %.o,%.d, $(@))
9292

93-
CFLAGS_DEPS = $(foreach dep, $(call uniq, $(DEPENDENCIES)), $(if $($(dep)_CFLAGS), $($(dep)_CFLAGS)))
93+
CFLAGS_DEPS = $(foreach dep, $(call uniq, $(DEPENDENCIES)), $(if $($(HOST)$(dep)_CFLAGS), $($(HOST)$(dep)_CFLAGS)))
9494
BUILD_ALL = $(ARTIFACT_LIB) $(ARTIFACT_SLIB) $(ARTIFACT_PC)
9595

9696
ifeq ($(TEST), 1)
@@ -114,14 +114,14 @@ $(CXX_SRC_STUB):
114114
echo "#include <stdio.h>" > $(CXX_SRC_STUB)
115115

116116
$(OBJ_STUB): $(CXX_SRC_STUB)
117-
echo " $(CXX) [$(ARTIFACT_NAME)] $(CXX_FILE)"
117+
echo " $($(HOST)CXX) [$(ARTIFACT_NAME)] $(CXX_FILE)"
118118
mkdir -p $(dir $@)
119-
$(CXX) -o $(@) -c $(CXX_SRC_STUB) -fPIC $(CXXFLAGS) $(ARTIFACT_MFLAGS) $(EXT_FLAGS) $(INCLUDE) $(CFLAGS_DEPS) -MMD -MP -MF $(DEP_FILE) -MT $(@)
119+
$($(HOST)CXX) -o $(@) -c $(CXX_SRC_STUB) -fPIC $($(HOST)CXXFLAGS) $(ARTIFACT_MFLAGS) $(EXT_FLAGS) $(INCLUDE) $(CFLAGS_DEPS) -MMD -MP -MF $(DEP_FILE) -MT $(@)
120120

121121
$(OBJ):
122-
echo " $(CXX) [$(ARTIFACT_NAME)] $(CXX_FILE)"
122+
echo " $($(HOST)CXX) [$(ARTIFACT_NAME)] $(CXX_FILE)"
123123
mkdir -p $(dir $@)
124-
$(CXX) -o $(@) -c $(CXX_FILE) -fPIC $(CXXFLAGS) $(ARTIFACT_MFLAGS) $(EXT_FLAGS) $(INCLUDE) $(CFLAGS_DEPS) -MMD -MP -MF $(DEP_FILE) -MT $(@)
124+
$($(HOST)CXX) -o $(@) -c $(CXX_FILE) -fPIC $($(HOST)CXXFLAGS) $(ARTIFACT_MFLAGS) $(EXT_FLAGS) $(INCLUDE) $(CFLAGS_DEPS) -MMD -MP -MF $(DEP_FILE) -MT $(@)
125125

126126
# Linking targets
127127
$(ARTIFACT_OBJ_META): $(XOBJ_MAIN_META)

0 commit comments

Comments
 (0)