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.
40 lines
1.8 KiB
40 lines
1.8 KiB
--- a/src/Makefile.in
|
|
+++ b/src/Makefile.in
|
|
@@ -7984,7 +7984,7 @@ cache_cf.o: cf_parser.cci
|
|
|
|
# cf_gen builds the configuration files.
|
|
cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
|
|
- $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
|
|
+ g++ -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
|
|
|
|
# squid.conf.default is built by cf_gen when making cf_parser.cci
|
|
squid.conf.default squid.conf.documented: cf_parser.cci
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -20842,7 +20842,7 @@ else
|
|
if test "$cross_compiling" = yes; then :
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
-as_fn_error $? "cannot run test program while cross compiling
|
|
+_as_fn_error $? "cannot run test program while cross compiling
|
|
See \`config.log' for more details" "$LINENO" 5; }
|
|
else
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
@@ -29142,7 +29142,7 @@ else
|
|
if test "$cross_compiling" = yes; then :
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
-as_fn_error $? "cannot run test program while cross compiling
|
|
+_as_fn_error $? "cannot run test program while cross compiling
|
|
See \`config.log' for more details" "$LINENO" 5; }
|
|
else
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
@@ -29167,7 +29167,7 @@ else
|
|
if test "$cross_compiling" = yes; then :
|
|
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
-as_fn_error $? "cannot run test program while cross compiling
|
|
+_as_fn_error $? "cannot run test program while cross compiling
|
|
See \`config.log' for more details" "$LINENO" 5; }
|
|
else
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|