diff -ru orig/configure patched/configure
--- orig/configure	2020-03-01 08:48:31.000000000 -0700
+++ patched/configure	2020-11-03 10:30:11.619125537 -0700
@@ -33,7 +33,7 @@
 MAKE=${MAKE:-make}
 LDFLAGS=
 prefix=/usr/local
-libdirsuffix=lib/ghdl
+libdirsuffix=ghdl
 libdirreverse=../..
 gcc_src_dir=
 llvm_config=
@@ -50,11 +50,20 @@
 EXEEXT=
 SOEXT=.so
 PIC_FLAGS=-fPIC
+ac_tool_prefix=
+libdir=
+# Unused parameters
+mandir=
+infodir=
+datadir=
+sysconfdir=
+localstatedir=
+
 
 show_help=no
 progname=$0
 
-subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_openieee enable_libghdl libghdl_version ghdl_version"
+subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_openieee enable_libghdl libghdl_version ghdl_version ac_tool_prefix libdir mandir infodir datadir sysconfdir localstatedir"
 
 # Find srcdir
 srcdir=`dirname $progname`
@@ -113,6 +122,16 @@
     --default-pic)          default_pic=true;;
     --enable-coverage)      build_mode="coverage";;
     -h|-help|--help)        show_help=yes;;
+    --build=*)              build="$optarg";;
+    --host=*)               host="$optarg";;
+    --libdir=*)             libdir="$optarg";;
+    # Unused parameters
+    --mandir=*)             mandir="$optarg";;
+    --infodir=*)            infodir="$optarg";;
+    --datadir=*)            datadir="$optarg";;
+    --sysconfdir=*)         sysconfdir="$optarg";;
+    --localstatedir=*)      localstatedir="$optarg";;
+
     *)
       echo "$0: unknown option $opt; try $0 --help"
       exit 1
@@ -120,6 +139,15 @@
   esac
 done
 
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+if test "x$libdir" = "x"; then
+    libdir=$prefix/lib
+fi
+
+
+
 # Help
 if test $show_help != no; then
   cat <<EOF
@@ -408,7 +436,7 @@
     -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
     -e "s%@POST_PROCESSOR@%oread-$backend%" \
     -e "s%@INSTALL_PREFIX@%$prefix%" \
-    -e "s%@LIB_PREFIX@%$libdirsuffix%" \
+    -e "s%@LIB_PREFIX@%$libdir/$libdirsuffix%" \
     -e "s%@SOEXT@%$SOEXT%" \
     -e "s%@default_pic@%$default_pic%" \
     < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
diff -ru orig/dist/gcc/Make-lang.in patched/dist/gcc/Make-lang.in
--- orig/dist/gcc/Make-lang.in	2020-03-01 08:48:31.000000000 -0700
+++ patched/dist/gcc/Make-lang.in	2020-11-03 10:33:16.522149271 -0700
@@ -103,6 +103,7 @@
 	echo "   Compiler_Mcode : constant String := \"\";" >> tmp-dpaths.ads
 	echo "   Compiler_Llvm  : constant String := \"\";" >> tmp-dpaths.ads
 	echo "   Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
+	# TODO: Fix this!!!
 	echo "   Lib_Prefix     : constant String :=">> tmp-dpaths.ads
 	echo "     \"lib/ghdl\";" >> tmp-dpaths.ads
 	echo "   Shared_Library_Extension : constant String :=">> tmp-dpaths.ads
diff -ru orig/Makefile.in patched/Makefile.in
--- orig/Makefile.in	2020-03-01 08:48:31.000000000 -0700
+++ patched/Makefile.in	2020-11-03 10:27:33.886103528 -0700
@@ -15,12 +15,12 @@
 #  along with GCC; see the file COPYING.  If not, write to the Free
 #  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #  02111-1307, USA.
-CC=@CC@
-CXX=@CXX@
+CC=@ac_tool_prefix@@CC@
+CXX=@ac_tool_prefix@@CXX@
 build=@build@
 srcdir=@srcdir@
 abs_srcdir=@abs_srcdir@
-GNATMAKE=@GNATMAKE@
+GNATMAKE=@ac_tool_prefix@@GNATMAKE@
 MAKE=@MAKE@
 prefix=@prefix@
 backend=@backend@
@@ -48,7 +48,7 @@
 PWD?=$(shell pwd)
 DESTDIR=
 bindir=$(prefix)/bin
-libdir=$(prefix)/lib
+libdir=/lib
 incdir=$(prefix)/include
 MKDIR=mkdir
 LN=ln -s
@@ -57,7 +57,7 @@
 SED=sed
 GRT_RANLIB=ranlib
 
-VHDL_LIB_DIR=$(prefix)/$(libdirsuffix)
+VHDL_LIB_DIR=$(libdir)/$(libdirsuffix)
 
 ifeq "$(enable_checks)" "true"
  # Debug + checks