Merge f111a18 into sapling-pr-archive-ktf

ktf · Sep 24, 2024 · 8c74375 · 8c74375
2 parents 3ddbdb6 + f111a18
commit 8c74375
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/gcc-toolchain.sh b/gcc-toolchain.sh
@@ -267,6 +267,10 @@ pushd build-gdb
   rm -f "$INSTALLROOT"/lib/*.la
 popd
 
+# We remove the sim folder because it's not used and actually
+# conflicts with FairRoot when installing in a single installation
+# path.
+rm -fr "$INSTALLROOT"/include/sim
 # If fixincludes is not desired, see:
 # http://ewontfix.com/12/
 # https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?view=markup&sortby=log#l1524