summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.SH7
-rwxr-xr-xcflags.SH12
2 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.SH b/Makefile.SH
index 999bd958e1..17e9fe7a68 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -156,6 +156,13 @@ esac
: Prepare dependency lists for Makefile.
dynamic_list=' '
extra_dep=''
+case "$d_cplusplus" in
+define)
+ : delete as a function name will not work.
+ dynamic_ext=`echo $dynamic_ext | sed 's/ODBM_File//'`
+ static_ext=`echo $static_ext | sed 's/ODBM_File//'`
+ ;;
+esac
for f in $dynamic_ext; do
: the dependency named here will never exist
base=`echo "$f" | sed 's/.*\///'`
diff --git a/cflags.SH b/cflags.SH
index 966901a935..95f846b683 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -234,10 +234,14 @@ esac
case "$cc" in
*g++*)
# Without -Wno-unused-variable g++ 4.x compiles are rather unwatchable
- # because of all the warnings about Perl___notused, and g++ doesn't
- # do __attribute__((unused)) (and even if at some stage it will), people
- # do have older gcc installations. Yes, we lose some valid warnings.
- for o in -Wno-unused-variable
+ # because of all the warnings about Perl___notused, and g++ doesn't do
+ # __attribute__((unused)) (and even if at some stage it may, people do
+ # have older gcc installations), and ((void)x) isn't enough to silence
+ # the noises about XS functions not using their cv parameter, so we need
+ # the -Wno-unused-parameter too.
+ # Yes, we lose some valid warnings, but hopefully other compilers
+ # (like gcc) will still pick up those warnings.
+ for o in -Wno-unused-variable -Wno-unused-parameter
do
case "$warn" in
*$o*) ;;