From 192dedd2ee3ab4b339e618e153dce335e8587907 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Tue, 5 Dec 2017 18:26:09 -0700
Subject: [PATCH] Fix debug builds of the debugger.  Fixes #245.  Fixes #246.

---
 src/engine/debugger.c | 4 ++--
 src/engine/jam.c      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/engine/debugger.c b/src/engine/debugger.c
index bb996031f..b58371d2b 100644
--- a/src/engine/debugger.c
+++ b/src/engine/debugger.c
@@ -1102,7 +1102,7 @@ static void debug_start_child( int argc, const char * * argv )
     PROCESS_INFORMATION pi = { NULL, NULL, 0, 0 };
     STARTUPINFO si = { sizeof( STARTUPINFO ), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0 };
-    assert( DEBUG_STATE == DEBUG_NO_CHILD );
+    assert( debug_state == DEBUG_NO_CHILD );
     if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) )
     {
         printf("internal error\n");
@@ -1189,7 +1189,7 @@ static void debug_start_child( int argc, const char * * argv )
     int read_fd;
     int pid;
     int i;
-    assert( DEBUG_STATE == DEBUG_NO_CHILD );
+    assert( debug_state == DEBUG_NO_CHILD );
     pipe(pipe1);
     pipe(pipe2);
     pid = fork();
diff --git a/src/engine/jam.c b/src/engine/jam.c
index 92686fc8d..4bca2fd7b 100644
--- a/src/engine/jam.c
+++ b/src/engine/jam.c
@@ -269,6 +269,7 @@ int main( int argc, char * * argv, char * * arg_environ )
 #endif
 
     cwd_init();
+    constants_init();
 
 #ifdef JAM_DEBUGGER
 
@@ -449,8 +450,6 @@ int main( int argc, char * * argv, char * * arg_environ )
         /* ++globs.noexec; */
     }
 
-    constants_init();
-
     {
         PROFILE_ENTER( MAIN );