From 106ff79f0820055e38ae691a78603c5f99b21c0c Mon Sep 17 00:00:00 2001 From: Lizonghang <870644199@qq.com> Date: Wed, 15 Jan 2025 13:02:52 +0400 Subject: [PATCH] include conda path only on Linux (if installing highs on Linux via conda) --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 25bf0c87..54163843 100644 --- a/Makefile +++ b/Makefile @@ -269,11 +269,11 @@ ifeq ($(UNAME_S),Darwin) else ifeq ($(UNAME_S),Linux) MK_CPPFLAGS += -isystem /usr/local/include -isystem /usr/local/include/highs MK_LDFLAGS += -L/usr/local/lib -lzmq -lhighs -endif - -ifneq ($(CONDA_PREFIX),) - MK_CPPFLAGS += -isystem $(CONDA_PREFIX)/include -isystem $(CONDA_PREFIX)/include/highs - MK_LDFLAGS += -L$(CONDA_PREFIX)/lib + + ifneq ($(CONDA_PREFIX),) + MK_CPPFLAGS += -isystem $(CONDA_PREFIX)/include -isystem $(CONDA_PREFIX)/include/highs + MK_LDFLAGS += -L$(CONDA_PREFIX)/lib + endif endif ifdef LLAMA_NO_CCACHE