dh-illumos (9.5.9) unstable; urgency=mediumv9.5.9

  * dh_illumos_gate:
    - define SAVEARGS= to disable -msave-args (not supported by our gcc)
    - define CW_GCC=gcc so cw from onbld can pick ccache
    - patch PATH in bldenv.sh: do not completely redefine PATH, but just
      append it (for ccache too)

1 files changed, 3 insertions, 0 deletions

diff --git a/dh_illumos_gate b/dh_illumos_gate
index c4d2285..5878cbd 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -363,6 +363,8 @@ if ( -d 'usr' && ! -f 'usr/env.sh') {
         print ENV "export __GNUC=''\n";
         print ENV "export __GNUC4=''\n";
         print ENV "export GCC_ROOT='/usr'\n";
+        print ENV "export CW_GCC=gcc\n";
+        print ENV "export SAVEARGS=\n";
         print ENV "export LEX='/usr/bin/flex -l'\n";
         print ENV "export STRIP=':'\n";
         print ENV "export MCS=':'\n";
@@ -398,6 +400,7 @@ if (-f $bldenv_sh && ! -f 'usr/bldenv.sh') {
     doit('cp', '-f', $bldenv_sh, 'usr/bldenv.sh');
     doit('sed', '-r', '-i', '
         s,export +(CTF.+)="(.+)",export \1="${\1:-\2}",;
+        s,^PATH=".+",PATH="${PATH}:/opt/onbld/bin:/opt/onbld/bin/${MACH}:.",;
         ', 'usr/bldenv.sh'
     );
 }