From f1bd00e7f54aad6479bc809c27d5cd3c2fb993eb Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 20 Dec 2013 11:10:43 +1300 Subject: [PATCH 1/5] Make it possible to disable the use of v8. Currently v8 is always built in, no matter what you pass to scons. This removes the (useless) --usev8 flag for scons and replaces it with a --disable-scripting option instead. --- SConstruct | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 3886d1b..6e0ef3b 100644 --- a/SConstruct +++ b/SConstruct @@ -225,7 +225,7 @@ add_option( "asio" , "Use Asynchronous IO (NOT READY YET)" , 0 , True ) add_option( "ssl" , "Enable SSL" , 0 , True ) # library choices -add_option( "usev8" , "use v8 for javascript" , 0 , True ) +add_option( "disable-scripting" , "do not build support for javascript" , 0 , True ) add_option( "libc++", "use libc++ (experimental, requires clang)", 0, True ) # mongo feature options @@ -442,7 +442,7 @@ static = has_option( "static" ) noshell = has_option( "noshell" ) -usev8 = has_option( "usev8" ) +disable_scripting = has_option( "disable-scripting" ) asio = has_option( "asio" ) @@ -600,7 +600,10 @@ if has_option( "durableDefaultOn" ): if has_option( "durableDefaultOff" ): env.Append( CPPDEFINES=[ "_DURABLEDEFAULTOFF" ] ) -usev8 = True +if disable_scripting or justClientLib: + usev8 = False +else: + usev8 = True extraLibPlaces = [] -- 1.9.0