aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Baruch Siach <baruch@tkos.co.il>2018-06-24 21:15:00 +0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-07-18 23:36:06 +0200
commitac9dc9fcab4c223029ec455d3aea251f3c6f9995 (patch)
tree3413d0b8500d6c99e5f9b4e0e33122bc8b50cb38
parent69099045ff048b103e3e2c175128ec79b91d4e32 (diff)
downloadbuildroot-ac9dc9fcab4c223029ec455d3aea251f3c6f9995.tar.gz
buildroot-ac9dc9fcab4c223029ec455d3aea251f3c6f9995.tar.bz2
dos2unix: fix static build
Pass the -static flag to the final link command. Otherwise, the generated executables are not static when the external toolchain provides both shared and static libraries. Should also fix: http://autobuild.buildroot.net/results/a5a/a5a64bc3ff5a91a8680ac52f3505362491923b26/ http://autobuild.buildroot.net/results/ebf/ebfe81e65751d7a5ca3aa4e20cc708a24ba65204/ Cc: David Bachelart <david.bachelart@bbright.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit fe5fcdfdbd209177cf8f4a5368ae2324540d4d67) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/dos2unix/dos2unix.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
index 9b82340590..5001397f05 100644
--- a/package/dos2unix/dos2unix.mk
+++ b/package/dos2unix/dos2unix.mk
@@ -24,6 +24,10 @@ ifeq ($(BR2_USE_WCHAR),)
DOS2UNIX_MAKE_OPTS += UCS=
endif
+ifeq ($(BR2_STATIC_LIBS),y)
+DOS2UNIX_MAKE_OPTS += LDFLAGS_USER=-static
+endif
+
define DOS2UNIX_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(DOS2UNIX_MAKE_OPTS)
endef