diff options
| author | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-04-15 11:57:52 -0600 |
|---|---|---|
| committer | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-04-15 12:16:35 -0600 |
| commit | c36dbf1f3ca1dd735f6852566349e7a3286d3047 (patch) | |
| tree | 0df4d6afdb0aa2a769ca19ad3bfb067c47f7dbc4 | |
| parent | e19c740933fd7677fe6c2129f45ab175d35210ce (diff) | |
Merge pull request #4537 from bkuhls/uclibc
[uClibc] Fix compilation on arm
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | m4/xbmc_arch.m4 | 2 | ||||
| -rw-r--r-- | tools/depends/configure.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index aaf7ee2ab6..8763d151c2 100644 --- a/configure.in +++ b/configure.in @@ -686,7 +686,7 @@ case $host in powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) ARCH="powerpc64-linux" ;; - arm*-*-linux-gnu*) + arm*-*-linux-gnu*|arm*-*-linux-uclibc*) ARCH="arm" use_arch="arm" ffmpeg_target_os=linux diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4 index 75d25da266..5bcdd81ddc 100644 --- a/m4/xbmc_arch.m4 +++ b/m4/xbmc_arch.m4 @@ -29,7 +29,7 @@ case $host in powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64") ;; - arm*-*-linux-gnu*) + arm*-*-linux-gnu*|arm*-*-linux-uclibc*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; *-*linux-android*) diff --git a/tools/depends/configure.in b/tools/depends/configure.in index 6793c77d34..642c708f59 100644 --- a/tools/depends/configure.in +++ b/tools/depends/configure.in @@ -119,7 +119,7 @@ case $host in #android builds are always cross cross_compiling="yes" ;; - arm*-*-linux-gnu*) + arm*-*-linux-gnu*|arm*-*-linux-uclibc*) if test "x$use_cpu" = "xauto"; then use_cpu=$host_cpu fi |