aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2014-05-22 22:05:42 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-05-22 22:08:28 +0200
commit9d797decbd95acec99260b8b3ed20bb3e3da0eb4 (patch)
tree99ebf261f22e928f7157662b3db85163535b7b0d
parent78271772e3dcb09fe7f9a249e896acd925e7fc79 (diff)
downloadbuildroot-9d797decbd95acec99260b8b3ed20bb3e3da0eb4.tar.gz
buildroot-9d797decbd95acec99260b8b3ed20bb3e3da0eb4.tar.bz2
dosfstools: fix static linking with libiconv
Fixes http://autobuild.buildroot.net/results/246/246c067f1e9def748498f0c6fa6988c036e1d109/ Pass the libraries to be linked in LDLIBS instead of LDFLAGS so the end up after the object files on the linker command line. While we are at it, use TARGET_CONFIGURE_OPTS instead of explictly passing CC/CFLAGS/LDFLAGS. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/dosfstools/dosfstools.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 8212f3fa65..a6b83d0d1e 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -9,14 +9,13 @@ DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
DOSFSTOOLS_SITE = http://daniel-baumann.ch/files/software/dosfstools
DOSFSTOOLS_LICENSE = GPLv3+
DOSFSTOOLS_LICENSE_FILES = COPYING
-DOSFSTOOLS_LDFLAGS = $(TARGET_LDFLAGS)
# Avoid target dosfstools dependencies, no host-libiconv
HOST_DOSFSTOOLS_DEPENDENCIES =
ifneq ($(BR2_ENABLE_LOCALE),y)
DOSFSTOOLS_DEPENDENCIES += libiconv
-DOSFSTOOLS_LDFLAGS += -liconv
+DOSFSTOOLS_LDLIBS += -liconv
endif
FATLABEL_BINARY = fatlabel
@@ -24,8 +23,7 @@ FSCK_FAT_BINARY = fsck.fat
MKFS_FAT_BINARY = mkfs.fat
define DOSFSTOOLS_BUILD_CMDS
- $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" \
- LDFLAGS="$(DOSFSTOOLS_LDFLAGS)" -C $(@D)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DOSFSTOOLS_LDLIBS)" -C $(@D)
endef
DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_FATLABEL)+=$(FATLABEL_BINARY)