Index: Makefile.in
===================================================================
--- Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -284,4 +284,5 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ benchmark/Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -168,4 +168,5 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
Index: configure
===================================================================
--- configure	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ configure	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -668,4 +668,5 @@
 LIBCFA_TARGET_DIRS
 TARGET_HOSTS
+HOST_FLAGS
 host_os
 host_vendor
@@ -3411,4 +3412,19 @@
 
 
+if ! test "$host_cpu" = "$build_cpu"; then
+	case $host_cpu in
+		i386)
+			HOST_FLAGS="-m32"
+			;;
+		i686)
+			HOST_FLAGS="-m32"
+			;;
+		x86_64)
+			HOST_FLAGS="-m64"
+			;;
+	esac
+fi
+
+
 default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ configure.ac	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -121,4 +121,19 @@
 AC_CANONICAL_HOST
 
+if ! test "$host_cpu" = "$build_cpu"; then
+	case $host_cpu in
+		i386)
+			HOST_FLAGS="-m32"
+			;;
+		i686)
+			HOST_FLAGS="-m32"
+			;;
+		x86_64)
+			HOST_FLAGS="-m64"
+			;;
+	esac
+fi
+AC_SUBST(HOST_FLAGS)
+
 default_target="${host_cpu}:debug, ${host_cpu}:nodebug"
 AC_ARG_WITH(target-hosts,
Index: driver/Makefile.am
===================================================================
--- driver/Makefile.am	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ driver/Makefile.am	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -18,5 +18,5 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
+AM_CXXFLAGS = @HOST_FLAGS@ -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
 
 # don't install cfa directly
Index: driver/Makefile.in
===================================================================
--- driver/Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ driver/Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -213,4 +213,5 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -301,5 +302,5 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
+AM_CXXFLAGS = @HOST_FLAGS@ -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
 cfa_SOURCES = cfa.cc
 
Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ libcfa/configure	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -2574,4 +2574,5 @@
 		cfa_prefix=${prefix}
 	fi
+	cfa_prefix="$(readlink -f ${cfa_prefix})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -2587,4 +2588,5 @@
 		cfa_incdir=${includedir}
 	fi
+	cfa_incdir="$(readlink -f ${cfa_incdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -2600,4 +2602,5 @@
 		cfa_bindir=${bindir}
 	fi
+	cfa_bindir="$(readlink -f ${cfa_bindir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -2617,4 +2620,5 @@
 		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
 	fi
+	cfa_libdir="$(readlink -f ${cfa_libdir})/"
 
 cat >>confdefs.h <<_ACEOF
Index: libcfa/prelude/Makefile.in
===================================================================
--- libcfa/prelude/Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ libcfa/prelude/Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -259,5 +259,5 @@
 
 # create object files in directory with source files
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = foreign subdir-objects
 
 # put into lib for now
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ src/Makefile.am	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -48,6 +48,6 @@
 ___driver_cfa_cpp_LDADD = -ldl			# yywrap
 
-AM_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
-AM_LDFLAGS = -Xlinker -export-dynamic
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
+AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ src/Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -358,4 +358,5 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -508,6 +509,6 @@
 ___driver_cfa_cpp_SOURCES = $(SRC)
 ___driver_cfa_cpp_LDADD = -ldl			# yywrap
-AM_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
-AM_LDFLAGS = -Xlinker -export-dynamic
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
+AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ tests/Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -210,4 +210,5 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
Index: tests/preempt_longrun/Makefile.in
===================================================================
--- tests/preempt_longrun/Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ tests/preempt_longrun/Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -369,4 +369,5 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
Index: tests/pybin/settings.py
===================================================================
--- tests/pybin/settings.py	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ tests/pybin/settings.py	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -51,14 +51,14 @@
 			self.target = arch
 			self.cross_compile = True
-			try :
-				self.flags = Architecture.CrossCompileFlags[arch]
-			except KeyError:
-				print("Cross compilation not available for architecture %s" % arch, file=sys.stderr)
-				sys.exit(1)
-
 		else:
 			self.target = canonical_host
 			self.cross_compile = False
-			self.flags = ""
+
+
+		try :
+			self.flags = Architecture.CrossCompileFlags[self.target]
+		except KeyError:
+			print("Cross compilation not available for architecture %s" % self.target, file=sys.stderr)
+			sys.exit(1)
 
 		self.string = self.target
Index: tools/Makefile.in
===================================================================
--- tools/Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ tools/Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -218,4 +218,5 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
Index: tools/prettyprinter/Makefile.in
===================================================================
--- tools/prettyprinter/Makefile.in	(revision 2ea0a8a12ad6c262bec0d17f6e20d736bec4149c)
+++ tools/prettyprinter/Makefile.in	(revision 47c1928b39e141cf752717688b57df8b99a499d7)
@@ -242,4 +242,5 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@