From 39fb317cbce4e8eec460f5dbe8b1774d805894a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Sat, 1 Feb 2025 19:24:09 +0100
Subject: [PATCH] Reorder compiler flags to adjust include path priority

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4f35c0d..b4aaa0f 100644
--- a/Makefile
+++ b/Makefile
@@ -58,15 +58,18 @@ install: build/slang.so
 	mkdir -p $(PLUGINDIR)
 	cp $< $(PLUGINDIR)
 
+# Note: -Ibuild/slang_install/include must appear before --cxxflags
+# in case there's a slang install at the Yosys install prefix
 -include $(OBJS:.o=.d)
 build/%.o: src/%.cc build/slang_install/.built
 	@mkdir -p $(@D)
 	@echo "    CXX $@"
-	@$(YOSYS_CONFIG) --exec --cxx --cxxflags -O3 -g -I . -MD \
-		 -c -o $@ $< -std=c++20 \
-		 $(CXXFLAGS) \
+	@$(YOSYS_CONFIG) --exec --cxx \
 		 -DSLANG_BOOST_SINGLE_HEADER \
-		 -Ibuild/slang_install/include
+		 -Ibuild/slang_install/include \
+		 --cxxflags -O3 -g -I . -MD \
+		 -c -o $@ $< -std=c++20 \
+		 $(CXXFLAGS)
 
 build/slang.so: $(OBJS)
 	@mkdir -p $(@D)