diff --git a/sys-apps/busybox/files/busybox-1.18.1-ldflags.patch b/sys-apps/busybox/files/busybox-1.18.1-ldflags.patch
--- a/sys-apps/busybox/files/busybox-1.18.1-ldflags.patch
+++ b/sys-apps/busybox/files/busybox-1.18.1-ldflags.patch
@@ -22,7 +22,7 @@ index d9204f4..e9b4700 100644
  export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
  export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
-index 5685b5b..a3926ab 100644
+index 5685b5b..5e733f8 100644
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
 @@ -174,7 +174,7 @@ cmd_modversions =							\
@@ -48,16 +48,16 @@ index 5685b5b..a3926ab 100644
  
  quiet_cmd_link_multi-y = LD      $@
 -cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
-+cmd_link_multi-y = $(CC) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(link_multi_deps)
++cmd_link_multi-y = $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(link_multi_deps)
  
  quiet_cmd_link_multi-m = LD [M]  $@
 -cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
-+cmd_link_multi-m = $(CC) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
++cmd_link_multi-m = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
  
  # We would rather have a list of rules like
  # 	foo.o: $(foo-objs)
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 3e54ea7..fbdf2a6 100644
+index 3e54ea7..342b0d6 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
 @@ -117,12 +117,7 @@ a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
@@ -83,7 +83,7 @@ index 3e54ea7..fbdf2a6 100644
 -quiet_cmd_ld = LD      $@
 -cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
 +quiet_cmd_ld = CCLD    $@
-+cmd_ld = $(CC) $(ld_flags) $(LDFLAGS_$(@F)) \
++cmd_ld = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_$(@F)) \
  	       $(filter-out FORCE,$^) -o $@
  
  # Objcopy