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>
This commit is contained in:
parent
78271772e3
commit
9d797decbd
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue