Guest User

busybox ltmain patch

a guest
Aug 20th, 2020
97
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.01 KB | None | 0 0
  1. --- ltmain.sh.orig
  2. +++ ltmain.sh
  3. @@ -2857,7 +2857,7 @@
  4.    $debug_cmd
  5.  
  6.    # awkward: cmd appends spaces to result
  7. -  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
  8. +  func_convert_core_msys_to_w32_result=`( cmd /c "echo $1" ) 2>/dev/null |
  9.      $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
  10.  }
  11.  #end: func_convert_core_msys_to_w32
  12. @@ -9824,20 +9824,7 @@
  13.       last_robj=
  14.       k=1
  15.  
  16. -     if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
  17. -       output=$output_objdir/$output_la.lnkscript
  18. -       func_verbose "creating GNU ld script: $output"
  19. -       echo 'INPUT (' > $output
  20. -       for obj in $save_libobjs
  21. -       do
  22. -         func_to_tool_file "$obj"
  23. -         $ECHO "$func_to_tool_file_result" >> $output
  24. -       done
  25. -       echo ')' >> $output
  26. -       func_append delfiles " $output"
  27. -       func_to_tool_file "$output"
  28. -       output=$func_to_tool_file_result
  29. -     elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
  30. +     if test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
  31.         output=$output_objdir/$output_la.lnk
  32.         func_verbose "creating linker input file list: $output"
  33.         : > $output
  34. @@ -9856,6 +9843,19 @@
  35.         func_append delfiles " $output"
  36.         func_to_tool_file "$output"
  37.         output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
  38. +     elif test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
  39. +       output=$output_objdir/$output_la.lnkscript
  40. +       func_verbose "creating GNU ld script: $output"
  41. +       echo 'INPUT (' > $output
  42. +       for obj in $save_libobjs
  43. +       do
  44. +         func_to_tool_file "$obj"
  45. +         $ECHO "$func_to_tool_file_result" >> $output
  46. +       done
  47. +       echo ')' >> $output
  48. +       func_append delfiles " $output"
  49. +       func_to_tool_file "$output"
  50. +       output=$func_to_tool_file_result
  51.       else
  52.         if test -n "$save_libobjs"; then
  53.           func_verbose "creating reloadable object files..."
  54.  
Advertisement
Add Comment
Please, Sign In to add comment