Skip to content

Commit f914aef

Browse files
ggerganovarthw
authored andcommitted
make : fix llava obj file race (ggml-org#8946)
ggml-ci
1 parent efea348 commit f914aef

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

Makefile

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,26 +1453,20 @@ libllava.a: examples/llava/llava.cpp \
14531453
$(CXX) $(CXXFLAGS) -static -fPIC -c $< -o $@ -Wno-cast-qual
14541454

14551455
llama-llava-cli: examples/llava/llava-cli.cpp \
1456-
examples/llava/clip.h \
1457-
examples/llava/clip.cpp \
1458-
examples/llava/llava.h \
14591456
examples/llava/llava.cpp \
1457+
examples/llava/llava.h \
1458+
examples/llava/clip.cpp \
1459+
examples/llava/clip.h \
14601460
$(OBJ_ALL)
1461-
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
1462-
$(CXX) $(CXXFLAGS) -c examples/llava/clip.cpp -o $(call GET_OBJ_FILE, examples/llava/clip.cpp) -Wno-cast-qual
1463-
$(CXX) $(CXXFLAGS) -c examples/llava/llava.cpp -o $(call GET_OBJ_FILE, examples/llava/llava.cpp)
1464-
$(CXX) $(CXXFLAGS) $(filter-out %.h $< examples/llava/clip.cpp examples/llava/llava.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/llava/clip.cpp) $(call GET_OBJ_FILE, examples/llava/llava.cpp) -o $@ $(LDFLAGS)
1461+
$(CXX) $(CXXFLAGS) $< $(filter-out %.h $<,$^) -o $@ $(LDFLAGS) -Wno-cast-qual
14651462

14661463
llama-minicpmv-cli: examples/llava/minicpmv-cli.cpp \
1467-
examples/llava/clip.h \
1468-
examples/llava/clip.cpp \
1469-
examples/llava/llava.h \
14701464
examples/llava/llava.cpp \
1465+
examples/llava/llava.h \
1466+
examples/llava/clip.cpp \
1467+
examples/llava/clip.h \
14711468
$(OBJ_ALL)
1472-
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
1473-
$(CXX) $(CXXFLAGS) -c examples/llava/clip.cpp -o $(call GET_OBJ_FILE, examples/llava/clip.cpp) -Wno-cast-qual
1474-
$(CXX) $(CXXFLAGS) -c examples/llava/llava.cpp -o $(call GET_OBJ_FILE, examples/llava/llava.cpp)
1475-
$(CXX) $(CXXFLAGS) $(filter-out %.h $< examples/llava/clip.cpp examples/llava/llava.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/llava/clip.cpp) $(call GET_OBJ_FILE, examples/llava/llava.cpp) -o $@ $(LDFLAGS)
1469+
$(CXX) $(CXXFLAGS) $< $(filter-out %.h $<,$^) -o $@ $(LDFLAGS) -Wno-cast-qual
14761470

14771471
ifeq ($(UNAME_S),Darwin)
14781472
swift: examples/batched.swift

0 commit comments

Comments
 (0)