| Index: SConstruct
|
| diff --git a/SConstruct b/SConstruct
|
| index 97189073b1897aa443520932e6e9ae5e12a397df..9365b22ca4939789a41e93a9a29c254aa9d6fca4 100644
|
| --- a/SConstruct
|
| +++ b/SConstruct
|
| @@ -35,7 +35,6 @@ root_dir = dirname(File('SConstruct').rfile().abspath)
|
| sys.path.append(join(root_dir, 'tools'))
|
| import js2c, utils
|
|
|
| -
|
| # ANDROID_TOP is the top of the Android checkout, fetched from the environment
|
| # variable 'TOP'. You will also need to set the CXX, CC, AR and RANLIB
|
| # environment variables to the cross-compiling tools.
|
| @@ -157,6 +156,11 @@ LIBRARY_FLAGS = {
|
| 'LIBPATH' : ['/usr/local/lib'],
|
| 'CCFLAGS': ['-ansi'],
|
| },
|
| + 'os:solaris': {
|
| + 'CPPPATH' : ['/usr/local/include'],
|
| + 'LIBPATH' : ['/usr/local/lib'],
|
| + 'CCFLAGS': ['-ansi'],
|
| + },
|
| 'os:win32': {
|
| 'CCFLAGS': ['-DWIN32'],
|
| 'CXXFLAGS': ['-DWIN32'],
|
| @@ -313,6 +317,10 @@ MKSNAPSHOT_EXTRA_FLAGS = {
|
| 'os:freebsd': {
|
| 'LIBS': ['execinfo', 'pthread']
|
| },
|
| + 'os:solaris': {
|
| + 'LIBS': ['m', 'pthread', 'socket', 'nsl', 'rt'],
|
| + 'LINKFLAGS': ['-mt']
|
| + },
|
| 'os:openbsd': {
|
| 'LIBS': ['execinfo', 'pthread']
|
| },
|
| @@ -362,6 +370,10 @@ CCTEST_EXTRA_FLAGS = {
|
| 'os:freebsd': {
|
| 'LIBS': ['execinfo', 'pthread']
|
| },
|
| + 'os:solaris': {
|
| + 'LIBS': ['m', 'pthread', 'socket', 'nsl', 'rt'],
|
| + 'LINKFLAGS': ['-mt']
|
| + },
|
| 'os:openbsd': {
|
| 'LIBS': ['execinfo', 'pthread']
|
| },
|
| @@ -420,6 +432,11 @@ SAMPLE_FLAGS = {
|
| 'LIBPATH' : ['/usr/local/lib'],
|
| 'LIBS': ['execinfo', 'pthread']
|
| },
|
| + 'os:solaris': {
|
| + 'LIBPATH' : ['/usr/local/lib'],
|
| + 'LIBS': ['m', 'pthread', 'socket', 'nsl', 'rt'],
|
| + 'LINKFLAGS': ['-mt']
|
| + },
|
| 'os:openbsd': {
|
| 'LIBPATH' : ['/usr/local/lib'],
|
| 'LIBS': ['execinfo', 'pthread']
|
| @@ -529,6 +546,10 @@ D8_FLAGS = {
|
| 'os:freebsd': {
|
| 'LIBS': ['pthread'],
|
| },
|
| + 'os:solaris': {
|
| + 'LIBS': ['m', 'pthread', 'socket', 'nsl', 'rt'],
|
| + 'LINKFLAGS': ['-mt']
|
| + },
|
| 'os:openbsd': {
|
| 'LIBS': ['pthread'],
|
| },
|
| @@ -582,7 +603,7 @@ SIMPLE_OPTIONS = {
|
| 'help': 'the toolchain to use (' + TOOLCHAIN_GUESS + ')'
|
| },
|
| 'os': {
|
| - 'values': ['freebsd', 'linux', 'macos', 'win32', 'android', 'openbsd'],
|
| + 'values': ['freebsd', 'linux', 'macos', 'win32', 'android', 'openbsd', 'solaris'],
|
| 'default': OS_GUESS,
|
| 'help': 'the os to build for (' + OS_GUESS + ')'
|
| },
|
| @@ -936,6 +957,7 @@ def BuildSpecific(env, mode, env_overrides):
|
|
|
| # Link the object files into a library.
|
| env.Replace(**context.flags['v8'])
|
| +
|
| context.ApplyEnvOverrides(env)
|
| if context.options['library'] == 'static':
|
| library = env.StaticLibrary(library_name, object_files)
|
|
|