Skip to content

Commit 272e3bd

Browse files
authored
make : fix llava obj file race (#8946)
ggml-ci
1 parent 45a55b9 commit 272e3bd

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
@@ -1454,26 +1454,20 @@ libllava.a: examples/llava/llava.cpp \
14541454
$(CXX) $(CXXFLAGS) -static -fPIC -c $< -o $@ -Wno-cast-qual
14551455

14561456
llama-llava-cli: examples/llava/llava-cli.cpp \
1457-
examples/llava/clip.h \
1458-
examples/llava/clip.cpp \
1459-
examples/llava/llava.h \
14601457
examples/llava/llava.cpp \
1458+
examples/llava/llava.h \
1459+
examples/llava/clip.cpp \
1460+
examples/llava/clip.h \
14611461
$(OBJ_ALL)
1462-
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
1463-
$(CXX) $(CXXFLAGS) -c examples/llava/clip.cpp -o $(call GET_OBJ_FILE, examples/llava/clip.cpp) -Wno-cast-qual
1464-
$(CXX) $(CXXFLAGS) -c examples/llava/llava.cpp -o $(call GET_OBJ_FILE, examples/llava/llava.cpp)
1465-
$(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)
1462+
$(CXX) $(CXXFLAGS) $< $(filter-out %.h $<,$^) -o $@ $(LDFLAGS) -Wno-cast-qual
14661463

14671464
llama-minicpmv-cli: examples/llava/minicpmv-cli.cpp \
1468-
examples/llava/clip.h \
1469-
examples/llava/clip.cpp \
1470-
examples/llava/llava.h \
14711465
examples/llava/llava.cpp \
1466+
examples/llava/llava.h \
1467+
examples/llava/clip.cpp \
1468+
examples/llava/clip.h \
14721469
$(OBJ_ALL)
1473-
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
1474-
$(CXX) $(CXXFLAGS) -c examples/llava/clip.cpp -o $(call GET_OBJ_FILE, examples/llava/clip.cpp) -Wno-cast-qual
1475-
$(CXX) $(CXXFLAGS) -c examples/llava/llava.cpp -o $(call GET_OBJ_FILE, examples/llava/llava.cpp)
1476-
$(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)
1470+
$(CXX) $(CXXFLAGS) $< $(filter-out %.h $<,$^) -o $@ $(LDFLAGS) -Wno-cast-qual
14771471

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

0 commit comments

Comments
 (0)