From: Tim 'mithro' Ansell <me@mith.ro>
Date: Mon, 24 Feb 2020 01:04:47 +0000 (-0800)
Subject: Fix the libcompiler_rt path.
X-Git-Tag: 24jan2021_ls180~424^2~7
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=83b25813311ce63edd8434500a0d3872967baca7;p=litex.git

Fix the libcompiler_rt path.
---

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