diff --git a/5.008.009-main,threaded-jessie/DevelPatchPerl.patch b/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
index bd42566..8dee9f0 100644
--- a/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 6f20c5e..684f369 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index ac264c3..a985a8e 100644
+index ac264c3..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -150,7 +150,7 @@ index ac264c3..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -143,93 +150,88 @@ case "$optimize" in
+@@ -143,93 +150,91 @@ case "$optimize" in
      ;;
  esac
  
@@ -196,6 +196,9 @@ index ac264c3..a985a8e 100644
 +# plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
  else
 -    cat <<'EOM' >&4
 +    gcc=gcc
@@ -321,7 +324,7 @@ index ac264c3..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -296,7 +298,7 @@ fi
+@@ -296,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -330,7 +333,7 @@ index ac264c3..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -311,24 +313,62 @@ esac
+@@ -311,24 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -404,7 +407,7 @@ index ac264c3..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -375,16 +415,6 @@ $define|true|[yY]*)
+@@ -375,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -421,7 +424,7 @@ index ac264c3..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -408,7 +438,7 @@ then
+@@ -408,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.008.009-main-jessie/DevelPatchPerl.patch b/5.008.009-main-jessie/DevelPatchPerl.patch
index bd42566..8dee9f0 100644
--- a/5.008.009-main-jessie/DevelPatchPerl.patch
+++ b/5.008.009-main-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 6f20c5e..684f369 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index ac264c3..a985a8e 100644
+index ac264c3..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -150,7 +150,7 @@ index ac264c3..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -143,93 +150,88 @@ case "$optimize" in
+@@ -143,93 +150,91 @@ case "$optimize" in
      ;;
  esac
  
@@ -196,6 +196,9 @@ index ac264c3..a985a8e 100644
 +# plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
  else
 -    cat <<'EOM' >&4
 +    gcc=gcc
@@ -321,7 +324,7 @@ index ac264c3..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -296,7 +298,7 @@ fi
+@@ -296,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -330,7 +333,7 @@ index ac264c3..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -311,24 +313,62 @@ esac
+@@ -311,24 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -404,7 +407,7 @@ index ac264c3..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -375,16 +415,6 @@ $define|true|[yY]*)
+@@ -375,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -421,7 +424,7 @@ index ac264c3..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -408,7 +438,7 @@ then
+@@ -408,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch b/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
index bd42566..8dee9f0 100644
--- a/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 6f20c5e..684f369 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index ac264c3..a985a8e 100644
+index ac264c3..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -150,7 +150,7 @@ index ac264c3..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -143,93 +150,88 @@ case "$optimize" in
+@@ -143,93 +150,91 @@ case "$optimize" in
      ;;
  esac
  
@@ -196,6 +196,9 @@ index ac264c3..a985a8e 100644
 +# plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
  else
 -    cat <<'EOM' >&4
 +    gcc=gcc
@@ -321,7 +324,7 @@ index ac264c3..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -296,7 +298,7 @@ fi
+@@ -296,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -330,7 +333,7 @@ index ac264c3..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -311,24 +313,62 @@ esac
+@@ -311,24 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -404,7 +407,7 @@ index ac264c3..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -375,16 +415,6 @@ $define|true|[yY]*)
+@@ -375,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -421,7 +424,7 @@ index ac264c3..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -408,7 +438,7 @@ then
+@@ -408,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.008.009-slim-jessie/DevelPatchPerl.patch b/5.008.009-slim-jessie/DevelPatchPerl.patch
index bd42566..8dee9f0 100644
--- a/5.008.009-slim-jessie/DevelPatchPerl.patch
+++ b/5.008.009-slim-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 6f20c5e..684f369 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index ac264c3..a985a8e 100644
+index ac264c3..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -150,7 +150,7 @@ index ac264c3..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -143,93 +150,88 @@ case "$optimize" in
+@@ -143,93 +150,91 @@ case "$optimize" in
      ;;
  esac
  
@@ -196,6 +196,9 @@ index ac264c3..a985a8e 100644
 +# plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
  else
 -    cat <<'EOM' >&4
 +    gcc=gcc
@@ -321,7 +324,7 @@ index ac264c3..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -296,7 +298,7 @@ fi
+@@ -296,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -330,7 +333,7 @@ index ac264c3..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -311,24 +313,62 @@ esac
+@@ -311,24 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -404,7 +407,7 @@ index ac264c3..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -375,16 +415,6 @@ $define|true|[yY]*)
+@@ -375,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -421,7 +424,7 @@ index ac264c3..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -408,7 +438,7 @@ then
+@@ -408,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.010.001-main,threaded-jessie/DevelPatchPerl.patch b/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
index d150bcb..db9f522 100644
--- a/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
@@ -119,7 +119,7 @@ index f8ca492..204bba0 100644
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
 diff --git a/hints/linux.sh b/hints/linux.sh
-index c88f157..a985a8e 100644
+index c88f157..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -203,7 +203,7 @@ index c88f157..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -146,93 +150,88 @@ case "$optimize" in
+@@ -146,93 +150,91 @@ case "$optimize" in
      ;;
  esac
  
@@ -249,6 +249,9 @@ index c88f157..a985a8e 100644
 +# plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
  else
 -    cat <<'EOM' >&4
 +    gcc=gcc
@@ -374,7 +377,7 @@ index c88f157..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -299,7 +298,7 @@ fi
+@@ -299,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -383,7 +386,7 @@ index c88f157..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -314,30 +313,62 @@ esac
+@@ -314,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -463,7 +466,7 @@ index c88f157..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -384,16 +415,6 @@ $define|true|[yY]*)
+@@ -384,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -480,7 +483,7 @@ index c88f157..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -417,7 +438,7 @@ then
+@@ -417,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.010.001-main-jessie/DevelPatchPerl.patch b/5.010.001-main-jessie/DevelPatchPerl.patch
index d150bcb..db9f522 100644
--- a/5.010.001-main-jessie/DevelPatchPerl.patch
+++ b/5.010.001-main-jessie/DevelPatchPerl.patch
@@ -119,7 +119,7 @@ index f8ca492..204bba0 100644
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
 diff --git a/hints/linux.sh b/hints/linux.sh
-index c88f157..a985a8e 100644
+index c88f157..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -203,7 +203,7 @@ index c88f157..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -146,93 +150,88 @@ case "$optimize" in
+@@ -146,93 +150,91 @@ case "$optimize" in
      ;;
  esac
  
@@ -249,6 +249,9 @@ index c88f157..a985a8e 100644
 +# plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
  else
 -    cat <<'EOM' >&4
 +    gcc=gcc
@@ -374,7 +377,7 @@ index c88f157..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -299,7 +298,7 @@ fi
+@@ -299,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -383,7 +386,7 @@ index c88f157..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -314,30 +313,62 @@ esac
+@@ -314,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -463,7 +466,7 @@ index c88f157..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -384,16 +415,6 @@ $define|true|[yY]*)
+@@ -384,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -480,7 +483,7 @@ index c88f157..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -417,7 +438,7 @@ then
+@@ -417,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch b/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
index d150bcb..db9f522 100644
--- a/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
@@ -119,7 +119,7 @@ index f8ca492..204bba0 100644
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
 diff --git a/hints/linux.sh b/hints/linux.sh
-index c88f157..a985a8e 100644
+index c88f157..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -203,7 +203,7 @@ index c88f157..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -146,93 +150,88 @@ case "$optimize" in
+@@ -146,93 +150,91 @@ case "$optimize" in
      ;;
  esac
  
@@ -249,6 +249,9 @@ index c88f157..a985a8e 100644
 +# plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
  else
 -    cat <<'EOM' >&4
 +    gcc=gcc
@@ -374,7 +377,7 @@ index c88f157..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -299,7 +298,7 @@ fi
+@@ -299,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -383,7 +386,7 @@ index c88f157..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -314,30 +313,62 @@ esac
+@@ -314,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -463,7 +466,7 @@ index c88f157..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -384,16 +415,6 @@ $define|true|[yY]*)
+@@ -384,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -480,7 +483,7 @@ index c88f157..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -417,7 +438,7 @@ then
+@@ -417,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.010.001-slim-jessie/DevelPatchPerl.patch b/5.010.001-slim-jessie/DevelPatchPerl.patch
index d150bcb..db9f522 100644
--- a/5.010.001-slim-jessie/DevelPatchPerl.patch
+++ b/5.010.001-slim-jessie/DevelPatchPerl.patch
@@ -119,7 +119,7 @@ index f8ca492..204bba0 100644
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
 diff --git a/hints/linux.sh b/hints/linux.sh
-index c88f157..a985a8e 100644
+index c88f157..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -203,7 +203,7 @@ index c88f157..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -146,93 +150,88 @@ case "$optimize" in
+@@ -146,93 +150,91 @@ case "$optimize" in
      ;;
  esac
  
@@ -249,6 +249,9 @@ index c88f157..a985a8e 100644
 +# plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
  else
 -    cat <<'EOM' >&4
 +    gcc=gcc
@@ -374,7 +377,7 @@ index c88f157..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -299,7 +298,7 @@ fi
+@@ -299,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -383,7 +386,7 @@ index c88f157..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -314,30 +313,62 @@ esac
+@@ -314,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -463,7 +466,7 @@ index c88f157..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -384,16 +415,6 @@ $define|true|[yY]*)
+@@ -384,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -480,7 +483,7 @@ index c88f157..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -417,7 +438,7 @@ then
+@@ -417,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.012.005-main,threaded-jessie/DevelPatchPerl.patch b/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
index eaf4706..08cf94b 100644
--- a/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
@@ -144,7 +144,7 @@ index f8ca492..204bba0 100644
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 0519eca..a985a8e 100644
+index 0519eca..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -222,7 +222,7 @@ index 0519eca..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -160,10 +159,18 @@ esac
+@@ -160,10 +159,21 @@ esac
  # This unconditionally uses gcc because even if the user is using another
  # compiler, we still need to find the math library and friends, and I don't
  # know how other compilers will cope with that situation.
@@ -232,6 +232,9 @@ index 0519eca..a985a8e 100644
  # plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
 +else
 +    gcc=gcc
 +fi
@@ -242,7 +245,7 @@ index 0519eca..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -171,93 +178,60 @@ case "$plibpth" in
+@@ -171,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -387,7 +390,7 @@ index 0519eca..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -324,7 +298,7 @@ fi
+@@ -324,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -396,7 +399,7 @@ index 0519eca..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -339,30 +313,62 @@ esac
+@@ -339,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -476,7 +479,7 @@ index 0519eca..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -409,16 +415,6 @@ $define|true|[yY]*)
+@@ -409,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -493,7 +496,7 @@ index 0519eca..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -442,7 +438,7 @@ then
+@@ -442,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.012.005-main-jessie/DevelPatchPerl.patch b/5.012.005-main-jessie/DevelPatchPerl.patch
index eaf4706..08cf94b 100644
--- a/5.012.005-main-jessie/DevelPatchPerl.patch
+++ b/5.012.005-main-jessie/DevelPatchPerl.patch
@@ -144,7 +144,7 @@ index f8ca492..204bba0 100644
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 0519eca..a985a8e 100644
+index 0519eca..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -222,7 +222,7 @@ index 0519eca..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -160,10 +159,18 @@ esac
+@@ -160,10 +159,21 @@ esac
  # This unconditionally uses gcc because even if the user is using another
  # compiler, we still need to find the math library and friends, and I don't
  # know how other compilers will cope with that situation.
@@ -232,6 +232,9 @@ index 0519eca..a985a8e 100644
  # plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
 +else
 +    gcc=gcc
 +fi
@@ -242,7 +245,7 @@ index 0519eca..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -171,93 +178,60 @@ case "$plibpth" in
+@@ -171,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -387,7 +390,7 @@ index 0519eca..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -324,7 +298,7 @@ fi
+@@ -324,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -396,7 +399,7 @@ index 0519eca..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -339,30 +313,62 @@ esac
+@@ -339,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -476,7 +479,7 @@ index 0519eca..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -409,16 +415,6 @@ $define|true|[yY]*)
+@@ -409,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -493,7 +496,7 @@ index 0519eca..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -442,7 +438,7 @@ then
+@@ -442,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch b/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
index eaf4706..08cf94b 100644
--- a/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
@@ -144,7 +144,7 @@ index f8ca492..204bba0 100644
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 0519eca..a985a8e 100644
+index 0519eca..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -222,7 +222,7 @@ index 0519eca..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -160,10 +159,18 @@ esac
+@@ -160,10 +159,21 @@ esac
  # This unconditionally uses gcc because even if the user is using another
  # compiler, we still need to find the math library and friends, and I don't
  # know how other compilers will cope with that situation.
@@ -232,6 +232,9 @@ index 0519eca..a985a8e 100644
  # plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
 +else
 +    gcc=gcc
 +fi
@@ -242,7 +245,7 @@ index 0519eca..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -171,93 +178,60 @@ case "$plibpth" in
+@@ -171,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -387,7 +390,7 @@ index 0519eca..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -324,7 +298,7 @@ fi
+@@ -324,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -396,7 +399,7 @@ index 0519eca..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -339,30 +313,62 @@ esac
+@@ -339,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -476,7 +479,7 @@ index 0519eca..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -409,16 +415,6 @@ $define|true|[yY]*)
+@@ -409,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -493,7 +496,7 @@ index 0519eca..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -442,7 +438,7 @@ then
+@@ -442,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.012.005-slim-jessie/DevelPatchPerl.patch b/5.012.005-slim-jessie/DevelPatchPerl.patch
index eaf4706..08cf94b 100644
--- a/5.012.005-slim-jessie/DevelPatchPerl.patch
+++ b/5.012.005-slim-jessie/DevelPatchPerl.patch
@@ -144,7 +144,7 @@ index f8ca492..204bba0 100644
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 0519eca..a985a8e 100644
+index 0519eca..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -222,7 +222,7 @@ index 0519eca..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -160,10 +159,18 @@ esac
+@@ -160,10 +159,21 @@ esac
  # This unconditionally uses gcc because even if the user is using another
  # compiler, we still need to find the math library and friends, and I don't
  # know how other compilers will cope with that situation.
@@ -232,6 +232,9 @@ index 0519eca..a985a8e 100644
  # plibpth to bypass this check.
 +if [ -x /usr/bin/gcc ] ; then
 +    gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
 +else
 +    gcc=gcc
 +fi
@@ -242,7 +245,7 @@ index 0519eca..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -171,93 +178,60 @@ case "$plibpth" in
+@@ -171,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -387,7 +390,7 @@ index 0519eca..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -324,7 +298,7 @@ fi
+@@ -324,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -396,7 +399,7 @@ index 0519eca..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -339,30 +313,62 @@ esac
+@@ -339,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -476,7 +479,7 @@ index 0519eca..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -409,16 +415,6 @@ $define|true|[yY]*)
+@@ -409,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -493,7 +496,7 @@ index 0519eca..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -442,7 +438,7 @@ then
+@@ -442,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.014.004-main,threaded-jessie/DevelPatchPerl.patch b/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
index cf1812f..e41e0f8 100644
--- a/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 56bc815..cf688be 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index d0ac9fa..a985a8e 100644
+index d0ac9fa..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index d0ac9fa..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index d0ac9fa..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index d0ac9fa..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index d0ac9fa..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,30 +313,62 @@ esac
+@@ -350,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -372,7 +380,7 @@ index d0ac9fa..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -420,16 +415,6 @@ $define|true|[yY]*)
+@@ -420,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -389,7 +397,7 @@ index d0ac9fa..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -453,7 +438,7 @@ then
+@@ -453,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.014.004-main-jessie/DevelPatchPerl.patch b/5.014.004-main-jessie/DevelPatchPerl.patch
index cf1812f..e41e0f8 100644
--- a/5.014.004-main-jessie/DevelPatchPerl.patch
+++ b/5.014.004-main-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 56bc815..cf688be 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index d0ac9fa..a985a8e 100644
+index d0ac9fa..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index d0ac9fa..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index d0ac9fa..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index d0ac9fa..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index d0ac9fa..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,30 +313,62 @@ esac
+@@ -350,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -372,7 +380,7 @@ index d0ac9fa..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -420,16 +415,6 @@ $define|true|[yY]*)
+@@ -420,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -389,7 +397,7 @@ index d0ac9fa..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -453,7 +438,7 @@ then
+@@ -453,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch b/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
index cf1812f..e41e0f8 100644
--- a/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 56bc815..cf688be 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index d0ac9fa..a985a8e 100644
+index d0ac9fa..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index d0ac9fa..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index d0ac9fa..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index d0ac9fa..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index d0ac9fa..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,30 +313,62 @@ esac
+@@ -350,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -372,7 +380,7 @@ index d0ac9fa..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -420,16 +415,6 @@ $define|true|[yY]*)
+@@ -420,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -389,7 +397,7 @@ index d0ac9fa..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -453,7 +438,7 @@ then
+@@ -453,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.014.004-slim-jessie/DevelPatchPerl.patch b/5.014.004-slim-jessie/DevelPatchPerl.patch
index cf1812f..e41e0f8 100644
--- a/5.014.004-slim-jessie/DevelPatchPerl.patch
+++ b/5.014.004-slim-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 56bc815..cf688be 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index d0ac9fa..a985a8e 100644
+index d0ac9fa..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index d0ac9fa..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index d0ac9fa..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index d0ac9fa..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index d0ac9fa..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,30 +313,62 @@ esac
+@@ -350,30 +316,62 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -372,7 +380,7 @@ index d0ac9fa..a985a8e 100644
          if echo $libswanted | grep -v pthread >/dev/null
          then
              set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
-@@ -420,16 +415,6 @@ $define|true|[yY]*)
+@@ -420,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -389,7 +397,7 @@ index d0ac9fa..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -453,7 +438,7 @@ then
+@@ -453,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.016.003-main,threaded-jessie/DevelPatchPerl.patch b/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
index 01caaa2..e3b594e 100644
--- a/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 439f254..a324604 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 688c68d..a985a8e 100644
+index 688c68d..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index 688c68d..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index 688c68d..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index 688c68d..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index 688c68d..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,17 +313,55 @@ esac
+@@ -350,17 +316,55 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -358,7 +366,7 @@ index 688c68d..a985a8e 100644
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure
  # after it has prompted the user for whether to use threads.
-@@ -414,16 +415,6 @@ $define|true|[yY]*)
+@@ -414,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -375,7 +383,7 @@ index 688c68d..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -447,7 +438,7 @@ then
+@@ -447,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.016.003-main-jessie/DevelPatchPerl.patch b/5.016.003-main-jessie/DevelPatchPerl.patch
index 01caaa2..e3b594e 100644
--- a/5.016.003-main-jessie/DevelPatchPerl.patch
+++ b/5.016.003-main-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 439f254..a324604 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 688c68d..a985a8e 100644
+index 688c68d..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index 688c68d..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index 688c68d..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index 688c68d..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index 688c68d..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,17 +313,55 @@ esac
+@@ -350,17 +316,55 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -358,7 +366,7 @@ index 688c68d..a985a8e 100644
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure
  # after it has prompted the user for whether to use threads.
-@@ -414,16 +415,6 @@ $define|true|[yY]*)
+@@ -414,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -375,7 +383,7 @@ index 688c68d..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -447,7 +438,7 @@ then
+@@ -447,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch b/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
index 01caaa2..e3b594e 100644
--- a/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 439f254..a324604 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 688c68d..a985a8e 100644
+index 688c68d..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index 688c68d..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index 688c68d..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index 688c68d..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index 688c68d..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,17 +313,55 @@ esac
+@@ -350,17 +316,55 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -358,7 +366,7 @@ index 688c68d..a985a8e 100644
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure
  # after it has prompted the user for whether to use threads.
-@@ -414,16 +415,6 @@ $define|true|[yY]*)
+@@ -414,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -375,7 +383,7 @@ index 688c68d..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -447,7 +438,7 @@ then
+@@ -447,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.016.003-slim-jessie/DevelPatchPerl.patch b/5.016.003-slim-jessie/DevelPatchPerl.patch
index 01caaa2..e3b594e 100644
--- a/5.016.003-slim-jessie/DevelPatchPerl.patch
+++ b/5.016.003-slim-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index 439f254..a324604 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 688c68d..a985a8e 100644
+index 688c68d..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index 688c68d..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index 688c68d..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index 688c68d..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index 688c68d..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,17 +313,55 @@ esac
+@@ -350,17 +316,55 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -358,7 +366,7 @@ index 688c68d..a985a8e 100644
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure
  # after it has prompted the user for whether to use threads.
-@@ -414,16 +415,6 @@ $define|true|[yY]*)
+@@ -414,16 +418,6 @@ $define|true|[yY]*)
      ;;
  esac
  
@@ -375,7 +383,7 @@ index 688c68d..a985a8e 100644
  # If using g++, the Configure scan for dlopen() and (especially)
  # dlerror() might fail, easier just to forcibly hint them in.
  case "$cc" in
-@@ -447,7 +438,7 @@ then
+@@ -447,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.018.004-main,threaded-jessie/DevelPatchPerl.patch b/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
index 9ceedb5..6fdd9f8 100644
--- a/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index b707911..2588f0b 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a148248..a985a8e 100644
+index a148248..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index a148248..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index a148248..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index a148248..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index a148248..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,17 +313,55 @@ esac
+@@ -350,17 +316,55 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -358,7 +366,7 @@ index a148248..a985a8e 100644
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure
  # after it has prompted the user for whether to use threads.
-@@ -437,7 +438,7 @@ then
+@@ -437,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.018.004-main-jessie/DevelPatchPerl.patch b/5.018.004-main-jessie/DevelPatchPerl.patch
index 9ceedb5..6fdd9f8 100644
--- a/5.018.004-main-jessie/DevelPatchPerl.patch
+++ b/5.018.004-main-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index b707911..2588f0b 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a148248..a985a8e 100644
+index a148248..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index a148248..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index a148248..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index a148248..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index a148248..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,17 +313,55 @@ esac
+@@ -350,17 +316,55 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -358,7 +366,7 @@ index a148248..a985a8e 100644
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure
  # after it has prompted the user for whether to use threads.
-@@ -437,7 +438,7 @@ then
+@@ -437,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch b/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
index 9ceedb5..6fdd9f8 100644
--- a/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index b707911..2588f0b 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a148248..a985a8e 100644
+index a148248..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index a148248..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index a148248..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index a148248..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index a148248..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,17 +313,55 @@ esac
+@@ -350,17 +316,55 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -358,7 +366,7 @@ index a148248..a985a8e 100644
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure
  # after it has prompted the user for whether to use threads.
-@@ -437,7 +438,7 @@ then
+@@ -437,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.018.004-slim-jessie/DevelPatchPerl.patch b/5.018.004-slim-jessie/DevelPatchPerl.patch
index 9ceedb5..6fdd9f8 100644
--- a/5.018.004-slim-jessie/DevelPatchPerl.patch
+++ b/5.018.004-slim-jessie/DevelPatchPerl.patch
@@ -67,7 +67,7 @@ index b707911..2588f0b 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a148248..a985a8e 100644
+index a148248..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -129,7 +129,15 @@ index a148248..a985a8e 100644
          ppc*)
              # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
              # with -O2 ; so downgrade to -O1.
-@@ -174,7 +170,7 @@ else
+@@ -169,12 +165,15 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
  fi
  
  case "$plibpth" in
@@ -138,7 +146,7 @@ index a148248..a985a8e 100644
  	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
      set X $plibpth # Collapse all entries on one line
      shift
-@@ -182,93 +178,60 @@ case "$plibpth" in
+@@ -182,93 +181,60 @@ case "$plibpth" in
      ;;
  esac
  
@@ -283,7 +291,7 @@ index a148248..a985a8e 100644
    echo ''
    echo 'You appear to have a working bash.  Good.'
  else
-@@ -335,7 +298,7 @@ fi
+@@ -335,7 +301,7 @@ fi
  #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
  #esac
  
@@ -292,7 +300,7 @@ index a148248..a985a8e 100644
  sparc*)
  	case "$cccdlflags" in
  	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
-@@ -350,17 +313,55 @@ esac
+@@ -350,17 +316,55 @@ esac
  # version of -lgdbm which is a bad idea. So if we have 'nm'
  # make sure it can read the file
  # NI-S 2003/08/07
@@ -358,7 +366,7 @@ index a148248..a985a8e 100644
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure
  # after it has prompted the user for whether to use threads.
-@@ -437,7 +438,7 @@ then
+@@ -437,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.020.003-main,threaded-stretch/DevelPatchPerl.patch b/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
index 1601391..60ca426 100644
--- a/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 956adfc..a985a8e 100644
+index 956adfc..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,33 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,33 @@ case "$plibpth" in
      ;;
  esac
  
@@ -36,7 +46,7 @@ index 956adfc..a985a8e 100644
  case "$libc" in
  '')
  # If you have glibc, then report the version for ./myconfig bug reporting.
-@@ -204,92 +231,6 @@ case "$libc" in
+@@ -204,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
@@ -129,7 +139,7 @@ index 956adfc..a985a8e 100644
  if ${sh:-/bin/sh} -c exit; then
    echo ''
    echo 'You appear to have a working bash.  Good.'
-@@ -497,7 +438,7 @@ then
+@@ -497,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.020.003-main-stretch/DevelPatchPerl.patch b/5.020.003-main-stretch/DevelPatchPerl.patch
index 1601391..60ca426 100644
--- a/5.020.003-main-stretch/DevelPatchPerl.patch
+++ b/5.020.003-main-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 956adfc..a985a8e 100644
+index 956adfc..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,33 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,33 @@ case "$plibpth" in
      ;;
  esac
  
@@ -36,7 +46,7 @@ index 956adfc..a985a8e 100644
  case "$libc" in
  '')
  # If you have glibc, then report the version for ./myconfig bug reporting.
-@@ -204,92 +231,6 @@ case "$libc" in
+@@ -204,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
@@ -129,7 +139,7 @@ index 956adfc..a985a8e 100644
  if ${sh:-/bin/sh} -c exit; then
    echo ''
    echo 'You appear to have a working bash.  Good.'
-@@ -497,7 +438,7 @@ then
+@@ -497,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch b/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
index 1601391..60ca426 100644
--- a/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 956adfc..a985a8e 100644
+index 956adfc..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,33 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,33 @@ case "$plibpth" in
      ;;
  esac
  
@@ -36,7 +46,7 @@ index 956adfc..a985a8e 100644
  case "$libc" in
  '')
  # If you have glibc, then report the version for ./myconfig bug reporting.
-@@ -204,92 +231,6 @@ case "$libc" in
+@@ -204,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
@@ -129,7 +139,7 @@ index 956adfc..a985a8e 100644
  if ${sh:-/bin/sh} -c exit; then
    echo ''
    echo 'You appear to have a working bash.  Good.'
-@@ -497,7 +438,7 @@ then
+@@ -497,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.020.003-slim-stretch/DevelPatchPerl.patch b/5.020.003-slim-stretch/DevelPatchPerl.patch
index 1601391..60ca426 100644
--- a/5.020.003-slim-stretch/DevelPatchPerl.patch
+++ b/5.020.003-slim-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 956adfc..a985a8e 100644
+index 956adfc..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,33 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,33 @@ case "$plibpth" in
      ;;
  esac
  
@@ -36,7 +46,7 @@ index 956adfc..a985a8e 100644
  case "$libc" in
  '')
  # If you have glibc, then report the version for ./myconfig bug reporting.
-@@ -204,92 +231,6 @@ case "$libc" in
+@@ -204,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
@@ -129,7 +139,7 @@ index 956adfc..a985a8e 100644
  if ${sh:-/bin/sh} -c exit; then
    echo ''
    echo 'You appear to have a working bash.  Good.'
-@@ -497,7 +438,7 @@ then
+@@ -497,7 +441,7 @@ then
         DBLIB="$DBDIR/libdb.so"
         if [ -f $DBLIB ]
         then
diff --git a/5.022.004-main,threaded-stretch/DevelPatchPerl.patch b/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
index 0c3d65d..444d016 100644
--- a/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..a985a8e 100644
+index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
@@ -19,7 +29,7 @@ index fb5a46e..a985a8e 100644
  # libquadmath is sometimes installed as gcc internal library,
  # so contrary to our usual policy of *not* looking at gcc internal
  # directories we now *do* look at them, in case they contain
-@@ -221,92 +231,6 @@ case "$libc" in
+@@ -221,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
diff --git a/5.022.004-main-stretch/DevelPatchPerl.patch b/5.022.004-main-stretch/DevelPatchPerl.patch
index 0c3d65d..444d016 100644
--- a/5.022.004-main-stretch/DevelPatchPerl.patch
+++ b/5.022.004-main-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..a985a8e 100644
+index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
@@ -19,7 +29,7 @@ index fb5a46e..a985a8e 100644
  # libquadmath is sometimes installed as gcc internal library,
  # so contrary to our usual policy of *not* looking at gcc internal
  # directories we now *do* look at them, in case they contain
-@@ -221,92 +231,6 @@ case "$libc" in
+@@ -221,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
diff --git a/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch b/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
index 0c3d65d..444d016 100644
--- a/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..a985a8e 100644
+index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
@@ -19,7 +29,7 @@ index fb5a46e..a985a8e 100644
  # libquadmath is sometimes installed as gcc internal library,
  # so contrary to our usual policy of *not* looking at gcc internal
  # directories we now *do* look at them, in case they contain
-@@ -221,92 +231,6 @@ case "$libc" in
+@@ -221,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
diff --git a/5.022.004-slim-stretch/DevelPatchPerl.patch b/5.022.004-slim-stretch/DevelPatchPerl.patch
index 0c3d65d..444d016 100644
--- a/5.022.004-slim-stretch/DevelPatchPerl.patch
+++ b/5.022.004-slim-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..a985a8e 100644
+index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
@@ -19,7 +29,7 @@ index fb5a46e..a985a8e 100644
  # libquadmath is sometimes installed as gcc internal library,
  # so contrary to our usual policy of *not* looking at gcc internal
  # directories we now *do* look at them, in case they contain
-@@ -221,92 +231,6 @@ case "$libc" in
+@@ -221,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
diff --git a/5.024.004-main,threaded-stretch/DevelPatchPerl.patch b/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
index 0c3d65d..444d016 100644
--- a/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..a985a8e 100644
+index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
@@ -19,7 +29,7 @@ index fb5a46e..a985a8e 100644
  # libquadmath is sometimes installed as gcc internal library,
  # so contrary to our usual policy of *not* looking at gcc internal
  # directories we now *do* look at them, in case they contain
-@@ -221,92 +231,6 @@ case "$libc" in
+@@ -221,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
diff --git a/5.024.004-main-stretch/DevelPatchPerl.patch b/5.024.004-main-stretch/DevelPatchPerl.patch
index 0c3d65d..444d016 100644
--- a/5.024.004-main-stretch/DevelPatchPerl.patch
+++ b/5.024.004-main-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..a985a8e 100644
+index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
@@ -19,7 +29,7 @@ index fb5a46e..a985a8e 100644
  # libquadmath is sometimes installed as gcc internal library,
  # so contrary to our usual policy of *not* looking at gcc internal
  # directories we now *do* look at them, in case they contain
-@@ -221,92 +231,6 @@ case "$libc" in
+@@ -221,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
diff --git a/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch b/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
index 0c3d65d..444d016 100644
--- a/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..a985a8e 100644
+index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
@@ -19,7 +29,7 @@ index fb5a46e..a985a8e 100644
  # libquadmath is sometimes installed as gcc internal library,
  # so contrary to our usual policy of *not* looking at gcc internal
  # directories we now *do* look at them, in case they contain
-@@ -221,92 +231,6 @@ case "$libc" in
+@@ -221,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
diff --git a/5.024.004-slim-stretch/DevelPatchPerl.patch b/5.024.004-slim-stretch/DevelPatchPerl.patch
index 0c3d65d..444d016 100644
--- a/5.024.004-slim-stretch/DevelPatchPerl.patch
+++ b/5.024.004-slim-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..a985a8e 100644
+index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
@@ -19,7 +29,7 @@ index fb5a46e..a985a8e 100644
  # libquadmath is sometimes installed as gcc internal library,
  # so contrary to our usual policy of *not* looking at gcc internal
  # directories we now *do* look at them, in case they contain
-@@ -221,92 +231,6 @@ case "$libc" in
+@@ -221,92 +234,6 @@ case "$libc" in
      ;;
  esac
  
diff --git a/5.026.003-main,threaded-buster/DevelPatchPerl.patch b/5.026.003-main,threaded-buster/DevelPatchPerl.patch
index 1701c2a..ae1c279 100644
--- a/5.026.003-main,threaded-buster/DevelPatchPerl.patch
+++ b/5.026.003-main,threaded-buster/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..a985a8e 100644
+index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
diff --git a/5.026.003-main,threaded-stretch/DevelPatchPerl.patch b/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
index 1701c2a..ae1c279 100644
--- a/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..a985a8e 100644
+index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
diff --git a/5.026.003-main-buster/DevelPatchPerl.patch b/5.026.003-main-buster/DevelPatchPerl.patch
index 1701c2a..ae1c279 100644
--- a/5.026.003-main-buster/DevelPatchPerl.patch
+++ b/5.026.003-main-buster/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..a985a8e 100644
+index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
diff --git a/5.026.003-main-stretch/DevelPatchPerl.patch b/5.026.003-main-stretch/DevelPatchPerl.patch
index 1701c2a..ae1c279 100644
--- a/5.026.003-main-stretch/DevelPatchPerl.patch
+++ b/5.026.003-main-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..a985a8e 100644
+index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
diff --git a/5.026.003-slim,threaded-buster/DevelPatchPerl.patch b/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
index 1701c2a..ae1c279 100644
--- a/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
+++ b/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..a985a8e 100644
+index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
diff --git a/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch b/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
index 1701c2a..ae1c279 100644
--- a/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..a985a8e 100644
+index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
diff --git a/5.026.003-slim-buster/DevelPatchPerl.patch b/5.026.003-slim-buster/DevelPatchPerl.patch
index 1701c2a..ae1c279 100644
--- a/5.026.003-slim-buster/DevelPatchPerl.patch
+++ b/5.026.003-slim-buster/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..a985a8e 100644
+index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
diff --git a/5.026.003-slim-stretch/DevelPatchPerl.patch b/5.026.003-slim-stretch/DevelPatchPerl.patch
index 1701c2a..ae1c279 100644
--- a/5.026.003-slim-stretch/DevelPatchPerl.patch
+++ b/5.026.003-slim-stretch/DevelPatchPerl.patch
@@ -1,8 +1,18 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..a985a8e 100644
+index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
-@@ -178,6 +178,16 @@ case "$plibpth" in
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
+@@ -178,6 +181,16 @@ case "$plibpth" in
      ;;
  esac
  
diff --git a/5.028.002-main,threaded-buster/DevelPatchPerl.patch b/5.028.002-main,threaded-buster/DevelPatchPerl.patch
index e69de29..11fdab0 100644
--- a/5.028.002-main,threaded-buster/DevelPatchPerl.patch
+++ b/5.028.002-main,threaded-buster/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.028.002-main,threaded-stretch/DevelPatchPerl.patch b/5.028.002-main,threaded-stretch/DevelPatchPerl.patch
index e69de29..11fdab0 100644
--- a/5.028.002-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.028.002-main,threaded-stretch/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.028.002-main-buster/DevelPatchPerl.patch b/5.028.002-main-buster/DevelPatchPerl.patch
index e69de29..11fdab0 100644
--- a/5.028.002-main-buster/DevelPatchPerl.patch
+++ b/5.028.002-main-buster/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.028.002-main-stretch/DevelPatchPerl.patch b/5.028.002-main-stretch/DevelPatchPerl.patch
index e69de29..11fdab0 100644
--- a/5.028.002-main-stretch/DevelPatchPerl.patch
+++ b/5.028.002-main-stretch/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.028.002-slim,threaded-buster/DevelPatchPerl.patch b/5.028.002-slim,threaded-buster/DevelPatchPerl.patch
index e69de29..11fdab0 100644
--- a/5.028.002-slim,threaded-buster/DevelPatchPerl.patch
+++ b/5.028.002-slim,threaded-buster/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.028.002-slim,threaded-stretch/DevelPatchPerl.patch b/5.028.002-slim,threaded-stretch/DevelPatchPerl.patch
index e69de29..11fdab0 100644
--- a/5.028.002-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.028.002-slim,threaded-stretch/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.028.002-slim-buster/DevelPatchPerl.patch b/5.028.002-slim-buster/DevelPatchPerl.patch
index e69de29..11fdab0 100644
--- a/5.028.002-slim-buster/DevelPatchPerl.patch
+++ b/5.028.002-slim-buster/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.028.002-slim-stretch/DevelPatchPerl.patch b/5.028.002-slim-stretch/DevelPatchPerl.patch
index e69de29..11fdab0 100644
--- a/5.028.002-slim-stretch/DevelPatchPerl.patch
+++ b/5.028.002-slim-stretch/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-main,threaded-buster/DevelPatchPerl.patch b/5.030.001-main,threaded-buster/DevelPatchPerl.patch
new file mode 100644
index 0000000..11fdab0
--- /dev/null
+++ b/5.030.001-main,threaded-buster/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-main,threaded-buster/Dockerfile b/5.030.001-main,threaded-buster/Dockerfile
new file mode 100644
index 0000000..5877483
--- /dev/null
+++ b/5.030.001-main,threaded-buster/Dockerfile
@@ -0,0 +1,29 @@
+FROM buildpack-deps:buster
+LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@cpan.org>"
+
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
+    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.1.tar.xz \
+    && cat *.patch | patch -p1 \
+    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
+    && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
+    && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
+    && make -j$(nproc) \
+    && TEST_JOBS=$(nproc) make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
+    && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
+    && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
+    && true \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
+
+WORKDIR /root
+
+CMD ["perl5.30.1","-de0"]
diff --git a/5.030.001-main,threaded-stretch/DevelPatchPerl.patch b/5.030.001-main,threaded-stretch/DevelPatchPerl.patch
new file mode 100644
index 0000000..11fdab0
--- /dev/null
+++ b/5.030.001-main,threaded-stretch/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-main,threaded-stretch/Dockerfile b/5.030.001-main,threaded-stretch/Dockerfile
new file mode 100644
index 0000000..41e29b0
--- /dev/null
+++ b/5.030.001-main,threaded-stretch/Dockerfile
@@ -0,0 +1,29 @@
+FROM buildpack-deps:stretch
+LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@cpan.org>"
+
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
+    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.1.tar.xz \
+    && cat *.patch | patch -p1 \
+    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
+    && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
+    && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
+    && make -j$(nproc) \
+    && TEST_JOBS=$(nproc) make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
+    && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
+    && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
+    && true \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
+
+WORKDIR /root
+
+CMD ["perl5.30.1","-de0"]
diff --git a/5.030.001-main-buster/DevelPatchPerl.patch b/5.030.001-main-buster/DevelPatchPerl.patch
new file mode 100644
index 0000000..11fdab0
--- /dev/null
+++ b/5.030.001-main-buster/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-main-buster/Dockerfile b/5.030.001-main-buster/Dockerfile
new file mode 100644
index 0000000..828baec
--- /dev/null
+++ b/5.030.001-main-buster/Dockerfile
@@ -0,0 +1,29 @@
+FROM buildpack-deps:buster
+LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@cpan.org>"
+
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
+    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.1.tar.xz \
+    && cat *.patch | patch -p1 \
+    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
+    && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
+    && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
+    && make -j$(nproc) \
+    && TEST_JOBS=$(nproc) make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
+    && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
+    && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
+    && true \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
+
+WORKDIR /root
+
+CMD ["perl5.30.1","-de0"]
diff --git a/5.030.001-main-stretch/DevelPatchPerl.patch b/5.030.001-main-stretch/DevelPatchPerl.patch
new file mode 100644
index 0000000..11fdab0
--- /dev/null
+++ b/5.030.001-main-stretch/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-main-stretch/Dockerfile b/5.030.001-main-stretch/Dockerfile
new file mode 100644
index 0000000..4ef0b7c
--- /dev/null
+++ b/5.030.001-main-stretch/Dockerfile
@@ -0,0 +1,29 @@
+FROM buildpack-deps:stretch
+LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@cpan.org>"
+
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN true \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
+    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.1.tar.xz \
+    && cat *.patch | patch -p1 \
+    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
+    && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
+    && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
+    && make -j$(nproc) \
+    && TEST_JOBS=$(nproc) make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
+    && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
+    && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
+    && true \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
+
+WORKDIR /root
+
+CMD ["perl5.30.1","-de0"]
diff --git a/5.030.001-slim,threaded-buster/DevelPatchPerl.patch b/5.030.001-slim,threaded-buster/DevelPatchPerl.patch
new file mode 100644
index 0000000..11fdab0
--- /dev/null
+++ b/5.030.001-slim,threaded-buster/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-slim,threaded-buster/Dockerfile b/5.030.001-slim,threaded-buster/Dockerfile
new file mode 100644
index 0000000..2330bd4
--- /dev/null
+++ b/5.030.001-slim,threaded-buster/Dockerfile
@@ -0,0 +1,53 @@
+FROM debian:buster-slim
+LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@cpan.org>"
+
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       # libbz2-dev \
+       # libdb-dev \
+       libc6-dev \
+       # libgdbm-dev \
+       # liblzma-dev \
+       make \
+       netbase \
+       patch \
+       # procps \
+       # zlib1g-dev \
+       xz-utils \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
+    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.1.tar.xz \
+    && cat *.patch | patch -p1 \
+    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
+    && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
+    && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
+    && make -j$(nproc) \
+    && TEST_JOBS=$(nproc) make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
+    && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
+    && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
+
+WORKDIR /root
+
+CMD ["perl5.30.1","-de0"]
diff --git a/5.030.001-slim,threaded-stretch/DevelPatchPerl.patch b/5.030.001-slim,threaded-stretch/DevelPatchPerl.patch
new file mode 100644
index 0000000..11fdab0
--- /dev/null
+++ b/5.030.001-slim,threaded-stretch/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-slim,threaded-stretch/Dockerfile b/5.030.001-slim,threaded-stretch/Dockerfile
new file mode 100644
index 0000000..db32ced
--- /dev/null
+++ b/5.030.001-slim,threaded-stretch/Dockerfile
@@ -0,0 +1,53 @@
+FROM debian:stretch-slim
+LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@cpan.org>"
+
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       # libbz2-dev \
+       # libdb-dev \
+       libc6-dev \
+       # libgdbm-dev \
+       # liblzma-dev \
+       make \
+       netbase \
+       patch \
+       # procps \
+       # zlib1g-dev \
+       xz-utils \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
+    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.1.tar.xz \
+    && cat *.patch | patch -p1 \
+    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
+    && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
+    && ./Configure -Darchname="$gnuArch" "$archFlag" -Dusethreads -Duseshrplib -Dvendorprefix=/usr/local  -des \
+    && make -j$(nproc) \
+    && TEST_JOBS=$(nproc) make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
+    && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
+    && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
+
+WORKDIR /root
+
+CMD ["perl5.30.1","-de0"]
diff --git a/5.030.001-slim-buster/DevelPatchPerl.patch b/5.030.001-slim-buster/DevelPatchPerl.patch
new file mode 100644
index 0000000..11fdab0
--- /dev/null
+++ b/5.030.001-slim-buster/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-slim-buster/Dockerfile b/5.030.001-slim-buster/Dockerfile
new file mode 100644
index 0000000..98d731e
--- /dev/null
+++ b/5.030.001-slim-buster/Dockerfile
@@ -0,0 +1,53 @@
+FROM debian:buster-slim
+LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@cpan.org>"
+
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       # libbz2-dev \
+       # libdb-dev \
+       libc6-dev \
+       # libgdbm-dev \
+       # liblzma-dev \
+       make \
+       netbase \
+       patch \
+       # procps \
+       # zlib1g-dev \
+       xz-utils \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
+    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.1.tar.xz \
+    && cat *.patch | patch -p1 \
+    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
+    && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
+    && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
+    && make -j$(nproc) \
+    && TEST_JOBS=$(nproc) make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
+    && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
+    && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
+
+WORKDIR /root
+
+CMD ["perl5.30.1","-de0"]
diff --git a/5.030.001-slim-stretch/DevelPatchPerl.patch b/5.030.001-slim-stretch/DevelPatchPerl.patch
new file mode 100644
index 0000000..11fdab0
--- /dev/null
+++ b/5.030.001-slim-stretch/DevelPatchPerl.patch
@@ -0,0 +1,14 @@
+diff --git a/hints/linux.sh b/hints/linux.sh
+index a985a8e..8cbe7dc 100644
+--- a/hints/linux.sh
++++ b/hints/linux.sh
+@@ -165,6 +165,9 @@ esac
+ # plibpth to bypass this check.
+ if [ -x /usr/bin/gcc ] ; then
+     gcc=/usr/bin/gcc
++# clang also provides -print-search-dirs
++elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
++    gcc=${cc:-cc}
+ else
+     gcc=gcc
+ fi
diff --git a/5.030.001-slim-stretch/Dockerfile b/5.030.001-slim-stretch/Dockerfile
new file mode 100644
index 0000000..3e39c93
--- /dev/null
+++ b/5.030.001-slim-stretch/Dockerfile
@@ -0,0 +1,53 @@
+FROM debian:stretch-slim
+LABEL maintainer="Peter Martini <PeterCMartini@GMail.com>, Zak B. Elep <zakame@cpan.org>"
+
+COPY *.patch /usr/src/perl/
+WORKDIR /usr/src/perl
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       bzip2 \
+       ca-certificates \
+       # cpio \
+       curl \
+       dpkg-dev \
+       # file \
+       gcc \
+       # g++ \
+       # libbz2-dev \
+       # libdb-dev \
+       libc6-dev \
+       # libgdbm-dev \
+       # liblzma-dev \
+       make \
+       netbase \
+       patch \
+       # procps \
+       # zlib1g-dev \
+       xz-utils \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
+    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.1.tar.xz \
+    && cat *.patch | patch -p1 \
+    && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+    && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
+    && archFlag="$([ "$archBits" = '64' ] && echo '-Duse64bitall' || echo '-Duse64bitint')" \
+    && ./Configure -Darchname="$gnuArch" "$archFlag" -Duseshrplib -Dvendorprefix=/usr/local  -des \
+    && make -j$(nproc) \
+    && TEST_JOBS=$(nproc) make test_harness \
+    && make install \
+    && cd /usr/src \
+    && curl -LO https://www.cpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz \
+    && echo '9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3 *App-cpanminus-1.7044.tar.gz' | sha256sum -c - \
+    && tar -xzf App-cpanminus-1.7044.tar.gz && cd App-cpanminus-1.7044 && perl bin/cpanm . && cd /root \
+    && savedPackages="make netbase" \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $savedPackages \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -fr /var/cache/apt/* /var/lib/apt/lists/* \
+    && rm -fr ./cpanm /root/.cpanm /usr/src/perl /usr/src/App-cpanminus-1.7044* /tmp/*
+
+WORKDIR /root
+
+CMD ["perl5.30.1","-de0"]