From 51a24d640eecafae3d63bddf6cfd4df0c4c90d38 Mon Sep 17 00:00:00 2001
From: Tim Head <betatim@gmail.com>
Date: Wed, 1 Feb 2017 17:13:37 +0100
Subject: [PATCH] Fix compiler and linker warnings

---
 khmer/_khmer.cc  | 2 +-
 lib/assembler.cc | 4 ++--
 lib/traversal.cc | 2 +-
 setup.py         | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/khmer/_khmer.cc b/khmer/_khmer.cc
index 80062b70a6..5264309e25 100644
--- a/khmer/_khmer.cc
+++ b/khmer/_khmer.cc
@@ -4004,7 +4004,7 @@ linearassembler_assemble(khmer_KLinearAssembler_Object * me,
     khmer_KNodegraph_Object * nodegraph_o = NULL;
     Nodegraph * stop_bf = NULL;
     const char * dir_str = NULL;
-    char dir = NULL;
+    char dir = '\0';
 
     const char *kwnames[] = {"seed_kmer", "stop_filter", "direction", NULL};
 
diff --git a/lib/assembler.cc b/lib/assembler.cc
index 464cec8311..85ec1288cc 100644
--- a/lib/assembler.cc
+++ b/lib/assembler.cc
@@ -50,7 +50,7 @@ namespace khmer
  ********************************/
 
 LinearAssembler::LinearAssembler(const Hashgraph * ht) :
-    graph(ht), _ksize(ht->ksize())
+    _ksize(ht->ksize()), graph(ht)
 {
 
 }
@@ -334,7 +334,7 @@ const
  ***************************************/
 
 JunctionCountAssembler::JunctionCountAssembler(Hashgraph * ht) :
-    graph(ht), _ksize(ht->ksize()), traverser(ht), linear_asm(ht)
+    linear_asm(ht), traverser(ht), graph(ht), _ksize(ht->ksize())
 {
     std::vector<uint64_t> table_sizes = graph->get_tablesizes();
     junctions = new Countgraph(_ksize, table_sizes);
diff --git a/lib/traversal.cc b/lib/traversal.cc
index 152c5fe609..e826f095ae 100644
--- a/lib/traversal.cc
+++ b/lib/traversal.cc
@@ -52,7 +52,7 @@ namespace khmer
 template <bool direction>
 NodeGatherer<direction>::NodeGatherer(const Hashgraph * ht,
                                       KmerFilterList filters) :
-    KmerFactory(ht->ksize()), graph(ht), filters(filters)
+    KmerFactory(ht->ksize()), filters(filters), graph(ht)
 {
     bitmask = 0;
     for (unsigned int i = 0; i < _ksize; i++) {
diff --git a/setup.py b/setup.py
index 05f181e061..c9dbd29780 100755
--- a/setup.py
+++ b/setup.py
@@ -152,6 +152,9 @@ def check_for_openmp():
     # force 64bit only builds
     EXTRA_COMPILE_ARGS.extend(['-arch', 'x86_64', '-mmacosx-version-min=10.7',
                                '-stdlib=libc++'])
+    EXTRA_LINK_ARGS.append('-mmacosx-version-min=10.7')
+    EXTRA_LINK_ARGS.append('-stdlib=libc++')
+
 
 if check_for_openmp():
     EXTRA_COMPILE_ARGS.extend(['-fopenmp'])