From: Georgi Gerganov <redacted>
Date: Tue, 7 Nov 2023 17:25:32 +0000 (+0200)
Subject: make : do not add linker flags when compiling static llava lib (#3977)
X-Git-Tag: upstream/0.0.4488~2990
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=413503d4b92500d82b002d03c580a71a54747138;p=pkg%2Fggml%2Fsources%2Fllama.cpp

make : do not add linker flags when compiling static llava lib (#3977)
---

diff --git a/Makefile b/Makefile
index f2d4fd03..d6be254a 100644
--- a/Makefile
+++ b/Makefile
@@ -618,7 +618,7 @@ llama-bench: examples/llama-bench/llama-bench.cpp ggml.o llama.o $(COMMON_DEPS)
 	$(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
 
 libllava.a: examples/llava/llava.cpp examples/llava/llava.h examples/llava/clip.cpp examples/llava/clip.h common/stb_image.h common/base64.hpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
-	$(CXX) $(CXXFLAGS) -static -fPIC -c $< -o $@ $(LDFLAGS) -Wno-cast-qual
+	$(CXX) $(CXXFLAGS) -static -fPIC -c $< -o $@ -Wno-cast-qual
 
 llava-cli: examples/llava/llava-cli.cpp examples/llava/clip.h examples/llava/clip.cpp examples/llava/llava.h examples/llava/llava.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS)
 	$(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS) -Wno-cast-qual