diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-07-06 15:19:10 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-07-06 15:19:10 +0000 |
| commit | d41f2bfb14a6b9b31062a328f0e05a9664eaca53 (patch) | |
| tree | 8ff1a6361303cdcec51d8652bfd32722f36acaea | |
| parent | 26b60a6ade45d048a9bfc70ff5d7ee58d4197f9d (diff) | |
| download | openocd+libswd-d41f2bfb14a6b9b31062a328f0e05a9664eaca53.tar.gz openocd+libswd-d41f2bfb14a6b9b31062a328f0e05a9664eaca53.tar.bz2 openocd+libswd-d41f2bfb14a6b9b31062a328f0e05a9664eaca53.tar.xz openocd+libswd-d41f2bfb14a6b9b31062a328f0e05a9664eaca53.zip | |
- 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
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | src/helper/replacements.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 5ce3ff3c..1dea31ff 100644 --- a/configure.in +++ b/configure.in @@ -824,7 +824,9 @@ main( int argc, char **argv ) AC_MSG_RESULT([Success!]) ], [ 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_RESULT([$want_ftd2xx_highspeed]) @@ -891,7 +893,10 @@ main( int argc, char **argv ) AC_MSG_RESULT([Success]) ], [ AC_MSG_ERROR([Cannot build & run test program using libftdi]) + ], [ + AC_MSG_RESULT([Skipping as we are cross-compiling]) ]) + # Restore the 'unexpanded ldflags' LDFLAGS=$LDFLAGS_SAVE CFLAGS=$CFLAGS_SAVE diff --git a/src/helper/replacements.h b/src/helper/replacements.h index 84530d3f..697476a4 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -210,6 +210,8 @@ static __inline int socket_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set #ifndef HAVE_ELF_H +#include "types.h" + typedef uint32_t Elf32_Addr; typedef uint16_t Elf32_Half; typedef uint32_t Elf32_Off; |