Skip to content
Snippets Groups Projects
Commit d41f2bfb authored by ntfreak's avatar ntfreak
Browse files

- fix build when using a cross compiler - do not try and run any host tools

- add missing types.h when platform does not contain elf.h

git-svn-id: svn://svn.berlios.de/openocd/trunk@2482 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 26b60a6a
No related branches found
No related tags found
No related merge requests found
...@@ -824,7 +824,9 @@ main( int argc, char **argv ) ...@@ -824,7 +824,9 @@ main( int argc, char **argv )
AC_MSG_RESULT([Success!]) AC_MSG_RESULT([Success!])
], [ ], [
AC_MSG_ERROR([Cannot build & run test program using ftd2xx.lib]) AC_MSG_ERROR([Cannot build & run test program using ftd2xx.lib])
] ) ], [
AC_MSG_RESULT([Skipping as we are cross-compiling])
])
AC_MSG_CHECKING([whether to build ftd2xx highspeed device support]) AC_MSG_CHECKING([whether to build ftd2xx highspeed device support])
AC_MSG_RESULT([$want_ftd2xx_highspeed]) AC_MSG_RESULT([$want_ftd2xx_highspeed])
...@@ -891,7 +893,10 @@ main( int argc, char **argv ) ...@@ -891,7 +893,10 @@ main( int argc, char **argv )
AC_MSG_RESULT([Success]) AC_MSG_RESULT([Success])
], [ ], [
AC_MSG_ERROR([Cannot build & run test program using libftdi]) AC_MSG_ERROR([Cannot build & run test program using libftdi])
], [
AC_MSG_RESULT([Skipping as we are cross-compiling])
]) ])
# Restore the 'unexpanded ldflags' # Restore the 'unexpanded ldflags'
LDFLAGS=$LDFLAGS_SAVE LDFLAGS=$LDFLAGS_SAVE
CFLAGS=$CFLAGS_SAVE CFLAGS=$CFLAGS_SAVE
......
...@@ -210,6 +210,8 @@ static __inline int socket_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set ...@@ -210,6 +210,8 @@ static __inline int socket_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set
#ifndef HAVE_ELF_H #ifndef HAVE_ELF_H
#include "types.h"
typedef uint32_t Elf32_Addr; typedef uint32_t Elf32_Addr;
typedef uint16_t Elf32_Half; typedef uint16_t Elf32_Half;
typedef uint32_t Elf32_Off; typedef uint32_t Elf32_Off;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment