600-fix-compile-flag-mismatch.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. --- a/gdb/configure
  2. +++ b/gdb/configure
  3. @@ -309,7 +309,7 @@
  4. # include <unistd.h>
  5. #endif"
  6. -ac_subdirs_all="$ac_subdirs_all doc testsuite"
  7. +ac_subdirs_all="$ac_subdirs_all doc"
  8. ac_subdirs_all="$ac_subdirs_all gdbtk"
  9. ac_subdirs_all="$ac_subdirs_all multi-ice"
  10. ac_subdirs_all="$ac_subdirs_all gdbserver"
  11. @@ -5939,7 +5939,7 @@
  12. -subdirs="$subdirs doc testsuite"
  13. +subdirs="$subdirs doc"
  14. # Provide defaults for some variables set by the per-host and per-target
  15. --- a/gdb/gdbserver/configure
  16. +++ b/gdb/gdbserver/configure
  17. @@ -1239,7 +1239,7 @@
  18. ac_cache_corrupted=: ;;
  19. ,);;
  20. *)
  21. - if test "x$ac_old_val" != "x$ac_new_val"; then
  22. + if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then
  23. { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
  24. echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
  25. { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
  26. --- a/gdb/testsuite/configure
  27. +++ b/gdb/testsuite/configure
  28. @@ -1248,7 +1248,7 @@
  29. ac_cache_corrupted=: ;;
  30. ,);;
  31. *)
  32. - if test "x$ac_old_val" != "x$ac_new_val"; then
  33. + if test "`echo $ac_old_val" != "`echo $ac_new_val"; then
  34. { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
  35. echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
  36. { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
  37. --- a/Makefile.in
  38. +++ b/Makefile.in
  39. @@ -329,7 +329,7 @@
  40. # CFLAGS will be just -g. We want to ensure that TARGET libraries
  41. # (which we know are built with gcc) are built with optimizations so
  42. # prepend -O2 when setting CFLAGS_FOR_TARGET.
  43. -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
  44. +CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
  45. SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
  46. CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
  47. LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
  48. --- a/Makefile.tpl
  49. +++ b/Makefile.tpl
  50. @@ -332,7 +332,7 @@
  51. # CFLAGS will be just -g. We want to ensure that TARGET libraries
  52. # (which we know are built with gcc) are built with optimizations so
  53. # prepend -O2 when setting CFLAGS_FOR_TARGET.
  54. -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
  55. +CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET))
  56. SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
  57. CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
  58. LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)