summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenkatesh Shukla <venkatesh.shukla.eee11@iitbhu.ac.in>2014-06-21 23:00:21 +0530
committerChris Dickens <christopher.a.dickens@gmail.com>2015-03-01 01:15:58 -0800
commitc7401ca1e0cb00b470fdb27416a5fe51b14281de (patch)
tree4dc9fc19ef902fc6789e047c6614a8baa9cb6336
parentdd4da212ee73bcaefa8ca94dadb1fef318e68762 (diff)
downloadlibusb-c7401ca1e0cb00b470fdb27416a5fe51b14281de.tar.gz
Remove -c flag. Erroneous output caused on android
While cross-building for android, the -c flag was causing errors. This -c option ends up in Libs.private of libusb-1.0.pc file. On its usage, it is interpreted as "Compile and assemble, but do not link" option of gcc. Usage of -c in this way might be unintended. Hence, removing this option. Signed-off-by: Venkatesh Shukla <venkatesh.shukla.eee11@iitbhu.ac.in> Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
-rw-r--r--configure.ac3
-rw-r--r--libusb/version_nano.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 399f397..aeafcdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,9 +127,6 @@ linux)
case $is_backend_android in
yes)
- dnl some pthread functions is in libc
- THREAD_CFLAGS="-c"
- LIBS="${LIBS} -c"
dnl there are gettimeofday function but configure doesn't seem to be able to find it.
AC_DEFINE([HAVE_GETTIMEOFDAY], [1], [Define if you have gettimeofday])
;;
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 8834b25..4414de6 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10965
+#define LIBUSB_NANO 10966