You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

49 lines
2.3 KiB

  1. --- a/src/Makefile.in
  2. +++ b/src/Makefile.in
  3. @@ -7742,7 +7742,7 @@ cache_cf.o: cf_parser.cci
  4. # cf_gen builds the configuration files.
  5. cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
  6. - $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
  7. + g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
  8. # squid.conf.default is built by cf_gen when making cf_parser.cci
  9. squid.conf.default squid.conf.documented: cf_parser.cci
  10. --- a/configure
  11. +++ b/configure
  12. @@ -22226,7 +22226,7 @@ $as_echo_n "checking whether the SSL_get
  13. if test "$cross_compiling" = yes; then :
  14. { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  15. $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  16. -as_fn_error $? "cannot run test program while cross compiling
  17. +_as_fn_error $? "cannot run test program while cross compiling
  18. See \`config.log' for more details" "$LINENO" 5; }
  19. else
  20. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  21. @@ -22274,7 +22274,7 @@ $as_echo_n "checking whether the workaro
  22. if test "$cross_compiling" = yes; then :
  23. { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  24. $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  25. -as_fn_error $? "cannot run test program while cross compiling
  26. +_as_fn_error $? "cannot run test program while cross compiling
  27. See \`config.log' for more details" "$LINENO" 5; }
  28. else
  29. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  30. @@ -24924,7 +24924,7 @@ else
  31. if test "$cross_compiling" = yes; then :
  32. { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  33. $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  34. -as_fn_error $? "cannot run test program while cross compiling
  35. +_as_fn_error $? "cannot run test program while cross compiling
  36. See \`config.log' for more details" "$LINENO" 5; }
  37. else
  38. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  39. @@ -24949,7 +24949,7 @@ else
  40. if test "$cross_compiling" = yes; then :
  41. { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  42. $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  43. -as_fn_error $? "cannot run test program while cross compiling
  44. +_as_fn_error $? "cannot run test program while cross compiling
  45. See \`config.log' for more details" "$LINENO" 5; }
  46. else
  47. cat confdefs.h - <<_ACEOF >conftest.$ac_ext