| Index: SConstruct
|
| diff --git a/SConstruct b/SConstruct
|
| index 117510624804dcf4a8be18bdbdc313fd0e08a598..592d531894e49511f11e533d63717c3e0db43860 100644
|
| --- a/SConstruct
|
| +++ b/SConstruct
|
| @@ -1066,7 +1066,7 @@ def AddOptions(options, result):
|
| def GetOptions():
|
| result = Options()
|
| result.Add('mode', 'compilation mode (debug, release)', 'release')
|
| - result.Add('sample', 'build sample (shell, process, lineprocessor)', '')
|
| + result.Add('sample', 'build sample (shell, process, lineprocessor, gdb-integration)', '')
|
| result.Add('cache', 'directory to use for scons build cache', '')
|
| result.Add('env', 'override environment settings (NAME0:value0,NAME1:value1,...)', '')
|
| result.Add('importenv', 'import environment settings (NAME0,NAME1,...)', '')
|
| @@ -1146,14 +1146,14 @@ def IsLegal(env, option, values):
|
| def VerifyOptions(env):
|
| if not IsLegal(env, 'mode', ['debug', 'release']):
|
| return False
|
| - if not IsLegal(env, 'sample', ["shell", "process", "lineprocessor"]):
|
| + if not IsLegal(env, 'sample', ["shell", "process", "lineprocessor", "gdb-integration"]):
|
| return False
|
| if not IsLegal(env, 'regexp', ["native", "interpreted"]):
|
| return False
|
| if env['os'] == 'win32' and env['library'] == 'shared' and env['prof'] == 'on':
|
| Abort("Profiling on windows only supported for static library.")
|
| - if env['gdbjit'] == 'on' and (env['os'] != 'linux' or (env['arch'] != 'ia32' and env['arch'] != 'x64' and env['arch'] != 'arm')):
|
| - Abort("GDBJIT interface is supported only for Intel-compatible (ia32 or x64) Linux target.")
|
| + if env['gdbjit'] == 'on' and ((env['os'] != 'linux' and env['os'] != 'macos') or (env['arch'] != 'ia32' and env['arch'] != 'x64' and env['arch'] != 'arm')):
|
| + Abort("GDBJIT interface is supported only for Intel-compatible (ia32 or x64) Linux/OSX target.")
|
| if env['os'] == 'win32' and env['soname'] == 'on':
|
| Abort("Shared Object soname not applicable for Windows.")
|
| if env['soname'] == 'on' and env['library'] == 'static':
|
|
|