diff options
| author | Anthony Green <green@moxielogic.com> | 2014-03-16 10:53:48 -0400 |
|---|---|---|
| committer | Anthony Green <green@moxielogic.com> | 2014-03-16 10:53:48 -0400 |
| commit | d948d0a729c934b0224749338a3ba0a2c8f51c45 (patch) | |
| tree | 8343063c3e5fc38b9837f1950539ce46a62301f2 | |
| parent | b61b472bd0647006d6685238721002017f1d119c (diff) | |
| parent | a86bd318e2424d879d784ee7b29d6536d7a17c18 (diff) | |
| download | libffi-d948d0a729c934b0224749338a3ba0a2c8f51c45.tar.gz | |
Merge pull request #98 from joshtriplett/unconfigure.host
Merge configure.host into configure.ac
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | configure.host | 11 |
3 files changed, 6 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index c06f374..557d526 100644 --- 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 index fa30882..3169c43 100644 --- 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 deleted file mode 100644 index f52457b..0000000 --- a/configure.host +++ /dev/null @@ -1,11 +0,0 @@ -# configure.host -# -# This shell script handles all host based configuration for libffi. -# - -# THIS TABLE IS SORTED. KEEP IT THAT WAY. -case "${host}" in - frv*-elf) - LDFLAGS=`echo $LDFLAGS | sed "s/\-B[^ ]*libgloss\/frv\///"`\ -B`pwd`/../libgloss/frv/ - ;; -esac |