From 83b25813311ce63edd8434500a0d3872967baca7 Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Sun, 23 Feb 2020 17:04:47 -0800
Subject: [PATCH] Fix the libcompiler_rt path.

---
 litex/soc/integration/builder.py           | 3 +++
 litex/soc/software/libcompiler_rt/Makefile | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py
index 6e995fa4..80cc3753 100644
--- a/litex/soc/integration/builder.py
+++ b/litex/soc/integration/builder.py
@@ -15,6 +15,7 @@ import struct
 import shutil
 
 from litex.build.tools import write_to_file
+from litex.data.find import find_data
 from litex.soc.integration import export, soc_core
 
 __all__ = ["soc_software_packages", "soc_directory",
@@ -100,6 +101,8 @@ class Builder:
                 exec_profiles["EXECUTE_IN_PLACE"] = "1"
             for k, v in exec_profiles.items():
                 define(k, v)
+            define(
+                "COMPILER_RT_DIRECTORY", find_data("software", "compiler_rt"))
             define("SOC_DIRECTORY", soc_directory)
             variables_contents.append("export BUILDINC_DIRECTORY\n")
             define("BUILDINC_DIRECTORY", self.include_dir)
diff --git a/litex/soc/software/libcompiler_rt/Makefile b/litex/soc/software/libcompiler_rt/Makefile
index 929616b3..ef78cd56 100644
--- a/litex/soc/software/libcompiler_rt/Makefile
+++ b/litex/soc/software/libcompiler_rt/Makefile
@@ -23,7 +23,7 @@ libcompiler_rt.a: $(OBJECTS)
 mulsi3.o: $(SOC_DIRECTORY)/software/libcompiler_rt/mulsi3.c
 	$(compile)
 
-%.o: $(SOC_DIRECTORY)/software/compiler_rt/lib/builtins/%.c
+%.o: $(COMPILER_RT_DIRECTORY)/lib/builtins/%.c
 	$(compile)
 
 .PHONY: all clean
-- 
2.30.2