diff --git a/scripts/mk_util.py b/scripts/mk_util.py index 589fc1013..7acbb2c94 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -1298,7 +1298,7 @@ def mk_config(): 'SLINK_OUT_FLAG=/Fe\n') extra_opt = '' if GIT_HASH: - extra_opt = '%s /D Z3GITHASH="%s"' % (extra_opt, GIT_HASH) + extra_opt = '%s /D Z3GITHASH=%s' % (extra_opt, GIT_HASH) if DEBUG_MODE: config.write( 'LINK_FLAGS=/nologo /MDd\n' @@ -1361,7 +1361,7 @@ def mk_config(): else: CPPFLAGS = '%s -D_MP_INTERNAL' % CPPFLAGS if GIT_HASH: - CPPFLAGS = '%s -DZ3GITHASH="%s"' % (CPPFLAGS, GIT_HASH) + CPPFLAGS = '%s -DZ3GITHASH=%s' % (CPPFLAGS, GIT_HASH) CXXFLAGS = '%s -c' % CXXFLAGS HAS_OMP = test_openmp(CXX) if HAS_OMP: diff --git a/src/shell/main.cpp b/src/shell/main.cpp index 7c69f66ba..63e604719 100644 --- a/src/shell/main.cpp +++ b/src/shell/main.cpp @@ -50,6 +50,9 @@ void error(const char * msg) { exit(ERR_CMD_LINE); } +#define STRINGIZE(x) #x +#define STRINGIZE_VALUE_OF(x) STRINGIZE(x) + void display_usage() { std::cout << "Z3 [version " << Z3_MAJOR_VERSION << "." << Z3_MINOR_VERSION << "." << Z3_BUILD_NUMBER; std::cout << " - "; @@ -60,7 +63,7 @@ void display_usage() { #endif std::cout << " bit"; #ifdef Z3GITHASH - std::cout << " - build hashcode " << Z3GITHASH; + std::cout << " - build hashcode " << STRINGIZE_VALUE_OF(Z3GITHASH); #endif std::cout << "]. (C) Copyright 2006-2013 Microsoft Corp.\n"; std::cout << "Usage: z3 [options] [-file:]file\n";