diff options
| author | Cebtenzzre <cebtenzzre@gmail.com> | 2023-09-07 10:13:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-07 10:13:50 -0400 |
| commit | 5ffab089a54bc06ae4a9ab533893b558756a1e80 (patch) | |
| tree | 438004330492878f156687136ee8bf44dd782d9f | |
| parent | 15b67a66c2f2d6032415b28a699b5131962318f1 (diff) | |
make : fix CPPFLAGS (#3035)
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -91,8 +91,8 @@ else OPT = -O3 endif MK_CPPFLAGS = -I. -Icommon -MK_CFLAGS = $(CPPFLAGS) $(OPT) -std=c11 -fPIC -MK_CXXFLAGS = $(CPPFLAGS) $(OPT) -std=c++11 -fPIC +MK_CFLAGS = $(OPT) -std=c11 -fPIC +MK_CXXFLAGS = $(OPT) -std=c++11 -fPIC MK_LDFLAGS = ifdef LLAMA_DEBUG @@ -381,9 +381,8 @@ k_quants.o: k_quants.c k_quants.h endif # LLAMA_NO_K_QUANTS # combine build flags with cmdline overrides -override CPPFLAGS := $(MK_CPPFLAGS) $(CPPFLAGS) -override CFLAGS := $(MK_CFLAGS) $(CFLAGS) -override CXXFLAGS := $(MK_CXXFLAGS) $(CXXFLAGS) +override CFLAGS := $(MK_CPPFLAGS) $(CPPFLAGS) $(MK_CFLAGS) $(CFLAGS) +override CXXFLAGS := $(MK_CPPFLAGS) $(CPPFLAGS) $(MK_CXXFLAGS) $(CXXFLAGS) override LDFLAGS := $(MK_LDFLAGS) $(LDFLAGS) # |