diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2015-01-20 18:29:31 +0300 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2015-02-04 21:56:45 +0000 |
| commit | d0db4bfcec03de790d213da7c760bc452bb19d26 (patch) | |
| tree | 26a2126336de62d3da206b72054462945a6cf2a9 /src/Makefile.am | |
| parent | 35de943d350bf90b8770f181575847937714cb27 (diff) | |
| download | riscv-openocd-d0db4bfcec03de790d213da7c760bc452bb19d26.zip riscv-openocd-d0db4bfcec03de790d213da7c760bc452bb19d26.tar.gz riscv-openocd-d0db4bfcec03de790d213da7c760bc452bb19d26.tar.bz2 | |
Makefile.am: link libusb-1.0 after libusb-0.1 to fix dependencies
Since libusb-0.1 might be provided by libusb-compat, it will depend on
libusb-1.0, so needs to be mentioned before it in the link command
line, this is relevant for static linking.
Thanks go to mingwandroid for spotting it during MSYS2 build.
Change-Id: I15cf0b8f084c351b4f93e75686bd0f843477352b
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2485
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7d67e3d..26e02d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -74,7 +74,7 @@ libopenocd_la_LIBADD = \ $(top_builddir)/src/rtos/librtos.la \ $(top_builddir)/src/helper/libhelper.la \ $(LIBFTDI_LIBS) $(MINGWLDADD) \ - $(HIDAPI_LIBS) $(LIBUSB1_LIBS) $(LIBUSB0_LIBS) + $(HIDAPI_LIBS) $(LIBUSB0_LIBS) $(LIBUSB1_LIBS) STARTUP_TCL_SRCS = \ $(srcdir)/helper/startup.tcl \ |