Merge pull request libffi#98 from joshtriplett/unconfigure.host

Merge configure.host into configure.ac
ffontaine · Mar 16, 2014 · d948d0a · d948d0a
2 parents b61b472 + a86bd31
commit d948d0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = include testsuite man
 
-EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host	\
+EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj			\
 	 src/aarch64/ffi.c src/aarch64/ffitarget.h src/aarch64/sysv.S	\
 	 src/alpha/ffi.c src/alpha/osf.S			\
 	 src/alpha/ffitarget.h src/arc/ffi.c src/arc/arcompact.S	\

diff --git a/configure.ac b/configure.ac
@@ -8,7 +8,11 @@ AC_CONFIG_HEADERS([fficonfig.h])
 AC_CANONICAL_SYSTEM
 target_alias=${target_alias-$host_alias}
 
-. ${srcdir}/configure.host
+case "${host}" in
+  frv*-elf)
+    LDFLAGS=`echo $LDFLAGS | sed "s/\-B[^ ]*libgloss\/frv\///"`\ -B`pwd`/../libgloss/frv/
+    ;;
+esac
 
 AX_ENABLE_BUILDDIR
 

diff --git a/configure.host b/configure.host