diff options
| -rw-r--r-- | etc/scons/xcode_tvos_sim.vars | 6 | ||||
| -rw-r--r-- | src/mongo/embedded/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/tools/SConscript | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/etc/scons/xcode_tvos_sim.vars b/etc/scons/xcode_tvos_sim.vars index 48b79d2f2f8..1e0cd8c10b0 100644 --- a/etc/scons/xcode_tvos_sim.vars +++ b/etc/scons/xcode_tvos_sim.vars @@ -2,10 +2,10 @@ import subprocess -CC = subprocess.check_output(['xcrun', '-f', '--sdk', 'appletvsimulator', 'clang']).decode.strip() -CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'appletvsimulator', 'clang++']).decode.strip() +CC = subprocess.check_output(['xcrun', '-f', '--sdk', 'appletvsimulator', 'clang']).decode('utf-8').strip() +CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'appletvsimulator', 'clang++']).decode('utf-8').strip() -sdk_path = subprocess.check_output(['xcrun', '--sdk', 'appletvsimulator', '--show-sdk-path']).decode.strip() +sdk_path = subprocess.check_output(['xcrun', '--sdk', 'appletvsimulator', '--show-sdk-path']).decode('utf-8').strip() CCFLAGS = "-isysroot {} -mtvos-version-min=11.0 -arch x86_64 -fembed-bitcode".format(sdk_path) LINKFLAGS = "-Wl,-syslibroot,{} -mtvos-version-min=11.0 -arch x86_64 -fembed-bitcode".format(sdk_path) diff --git a/src/mongo/embedded/SConscript b/src/mongo/embedded/SConscript index b9838079dc5..dca5deb14e4 100644 --- a/src/mongo/embedded/SConscript +++ b/src/mongo/embedded/SConscript @@ -146,7 +146,7 @@ if get_option('link-model') != 'dynamic-sdk': '$BUILD_DIR/mongo/db/mongod_options', '$BUILD_DIR/mongo/db/repl/repl_set_status_commands', '$BUILD_DIR/mongo/db/server_options', - "$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger", + '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger' if get_option('wiredtiger') == 'on' else [], '$BUILD_DIR/mongo/embedded/embedded', '$BUILD_DIR/mongo/embedded/embedded_integration_helpers', '$BUILD_DIR/mongo/transport/service_entry_point', diff --git a/src/mongo/tools/SConscript b/src/mongo/tools/SConscript index bb8047acf8d..0e180170784 100644 --- a/src/mongo/tools/SConscript +++ b/src/mongo/tools/SConscript @@ -45,7 +45,7 @@ mongoebench = yamlEnv.Program( LIBDEPS=[ '$BUILD_DIR/mongo/db/dbdirectclient', '$BUILD_DIR/mongo/db/storage/storage_options', - '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger', + '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger' if get_option('wiredtiger') == 'on' else [], '$BUILD_DIR/mongo/embedded/embedded', '$BUILD_DIR/mongo/embedded/embedded_integration_helpers', '$BUILD_DIR/mongo/shell/benchrun', |