Browse Source

dropwatch: fix avr32 build failure

On avr32, dropwatch needs libiberty to avoid build failures such as

  http://autobuild.buildroot.net/results/cd5/cd5e22fb5c9b0fc5d396bc85a5e253a1a65054da/

Also test built on ARM.

[Peter: pass TARGET_LDFLAGS as well, append -lintl in gettext case]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Simon Dawson 11 years ago
parent
commit
da1ca5c0a2
1 changed files with 7 additions and 2 deletions
  1. 7 2
      package/dropwatch/dropwatch.mk

+ 7 - 2
package/dropwatch/dropwatch.mk

@@ -13,13 +13,18 @@ DROPWATCH_LICENSE_FILES = COPYING
 
 # libbfd may be linked to libintl
 # Ugly... but LDFLAGS are hardcoded anyway
+#
+# Also: always need to add -liberty to hardcoded LDFLAGS for avr32
+DROPWATCH_LDFLAGS = \
+	$(TARGET_LDFLAGS) -lbfd -liberty -lreadline -lnl-3 -lnl-genl-3
+
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-DROPWATCH_LDFLAGS = LDFLAGS="-lintl -lbfd -lreadline -lnl-3 -lnl-genl-3"
+DROPWATCH_LDFLAGS += -lintl
 endif
 
 define DROPWATCH_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(DROPWATCH_LDFLAGS) build
+		LDFLAGS="$(DROPWATCH_LDFLAGS)" build
 endef
 
 define DROPWATCH_CLEAN_CMDS