diff options
| -rw-r--r-- | package/gptfdisk/gptfdisk.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index c11b1d9cd4..e84e3d39e8 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -21,13 +21,17 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) GPTFDISK_DEPENDENCIES += ncurses endif -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_STATIC_LIBS),yy) -GPTFDISK_MAKE_OPTS += LDLIBS=-lintl +ifeq ($(BR2_STATIC_LIBS),y) +# gptfdisk dependencies may link against libintl/libiconv, so we need +# to do so as well when linking statically +GPTFDISK_LDLIBS = \ + $(if $(BR2_PACKAGE_GETTEXT),-lintl) \ + $(if $(BR2_PACKAGE_LIBICONV),-liconv) endif define GPTFDISK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(GPTFDISK_MAKE_OPTS) $(GPTFDISK_TARGETS_y) + LDLIBS='$(GPTFDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) endef define GPTFDISK_INSTALL_TARGET_CMDS |
