rpi build fix

sev/exe/sev_server/src/os_templ/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-ifeq ($(PWRE_CONF_LIBHDF5),1)
+ifndef pwre_cxx
+  ifeq ($(PWRE_CONF_LIBHDF5),1)
     ldsev = mpic++
-else
+  else
     ldsev = $(ldxx)
+  endif
+else
+  ldsev = $(pwre_cxx)
 endif
 
 link = $(ldsev) $(elinkflags) $(domap) -o $(export_exe) \

src/exp/com/src/os_linux/hw_arm/wb_rtt_comppicture.sh

@@ -62,7 +62,7 @@ then
     cinc="-I$pwr_inc -I$pwrp_rttbld"
     cflags="-DOS_LINUX -DOS=linux -DHW_ARM=1 -DPOSIX_SOURCE -DWall"
     ${cc} -c -o $pwrp_obj/${name}.o $pwrp_rttbld/${name}.c ${cinc} ${cflags}
-    ar rc ${ar_name_pict} $pwrp_obj/${name}.o
+    ar rcU ${ar_name_pict} $pwrp_obj/${name}.o
   else
 #   echo "Is rttsys"
     ar_name_pict=${pwr_lib}/libpwr_dtt.a
@@ -78,7 +78,7 @@ then
     cflags="-DOS_LINUX -DOS=linux -DHW_ARM=1 -DPOSIX_SOURCE -DWall"
     ${cc} -c -o ${bld_dir}/${name}.o \
        ${bld_dir}/${name}.c ${cinc} ${cflags}
-    ar rc ${ar_name_pict} ${bld_dir}/${name}.o
+    ar rcU ${ar_name_pict} ${bld_dir}/${name}.o
   fi
 else
   echo "Opsys ($opsys) is not linux, not yet supported"

src/tools/pwre/src/os_linux/pwre.pl

@@ -1189,6 +1189,10 @@ sub copy ()
 
     my $flavour = $_[1];
 
+    if ( $flavour eq "") {
+      $flavour = "gtk";
+    }
+
     my($cmd) = "make -f $bindir/import_files.mk" . " " . $_[0] . "_" . $flavour; 
     system("$cmd");
   }