4 files changed, 7 insertions, 4 deletions
diff --git a/usrp/host/apps/usrper.cc b/usrp/host/apps/usrper.cc
index 620287d46..3740022e0 100644
--- a/usrp/host/apps/usrper.cc
+++ b/usrp/host/apps/usrper.cc
@@ -71,12 +71,14 @@ usage ()
   exit (1);
 }
 
+#if 0
 static void
 die (const char *msg)
 {
   fprintf (stderr, "%s (die): %s\n", prog_name, msg);
   exit (1);
 }
+#endif
 
 static int 
 hexval (char ch)
diff --git a/usrp/host/lib/legacy/std_paths.h.in b/usrp/host/lib/legacy/std_paths.h.in
index 9c26cfa23..e09499e0b 100644
--- a/usrp/host/lib/legacy/std_paths.h.in
+++ b/usrp/host/lib/legacy/std_paths.h.in
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-static char *std_paths[] = {
+static const char *std_paths[] = {
   "@prefix@/share/usrp",
   "/usr/local/share/usrp",
   0
diff --git a/usrp/host/lib/legacy/usrp_prims.cc b/usrp/host/lib/legacy/usrp_prims.cc
index 0034bb31e..c2f74f5f1 100644
--- a/usrp/host/lib/legacy/usrp_prims.cc
+++ b/usrp/host/lib/legacy/usrp_prims.cc
@@ -58,8 +58,8 @@ static const int hash_slot_addr[2] = {
   USRP_HASH_SLOT_1_ADDR
 };
 
-static char *default_firmware_filename = "std.ihx";
-static char *default_fpga_filename     = "std_2rxhb_2tx.rbf";
+static const char *default_firmware_filename = "std.ihx";
+static const char *default_fpga_filename     = "std_2rxhb_2tx.rbf";
 
 #include "std_paths.h"
 #include <stdio.h>
@@ -67,7 +67,7 @@ static char *default_fpga_filename     = "std_2rxhb_2tx.rbf";
 static char *
 find_file (const char *filename, int hw_rev)
 {
-  char **sp = std_paths;
+  const char **sp = std_paths;
   static char path[1000];
   char *s;
 
diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index dc92f2b48..57bc3bdc8 100644
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -69,6 +69,7 @@ noinst_HEADERS =
 _usrp_prims_la_LIBADD  = $(USRP_LA) -lstdc++ $(PYTHON_LDFLAGS)
 _usrp_prims_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
+_usrp_prims_la_CXXFLAGS = @swig_CXXFLAGS@
 
 prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h
 	$(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc prims.i