summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2012-03-05 11:04:45 +0000
committerBen Murdoch <benm@google.com>2012-04-11 15:39:56 +0100
commit592a9fc1d8ea420377a2e7efd0600e20b058be2b (patch)
tree23fe22995f4f9056a96266d169d49426a5e745d7 /SConstruct
parente25ed7434cc3a061dd965ad25b923bca153aed94 (diff)
downloadandroid_external_v8-592a9fc1d8ea420377a2e7efd0600e20b058be2b.tar.gz
android_external_v8-592a9fc1d8ea420377a2e7efd0600e20b058be2b.tar.bz2
android_external_v8-592a9fc1d8ea420377a2e7efd0600e20b058be2b.zip
Merge V8 at 3.7.12.28
Bug: 5688872 Change-Id: Iddb40cae44d51a2b449f2858951e0472771f5981
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct19
1 files changed, 18 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index f9c33caa..3f129079 100644
--- a/SConstruct
+++ b/SConstruct
@@ -129,6 +129,10 @@ LIBRARY_FLAGS = {
'LIBPATH' : ['/usr/local/lib'],
'CCFLAGS': ['-ansi'],
},
+ 'os:netbsd': {
+ 'CPPPATH' : ['/usr/pkg/include'],
+ 'LIBPATH' : ['/usr/pkg/lib'],
+ },
'os:win32': {
'CCFLAGS': ['-DWIN32'],
'CXXFLAGS': ['-DWIN32'],
@@ -364,6 +368,9 @@ MKSNAPSHOT_EXTRA_FLAGS = {
'os:win32': {
'LIBS': ['winmm', 'ws2_32'],
},
+ 'os:netbsd': {
+ 'LIBS': ['execinfo', 'pthread']
+ },
'compress_startup_data:bz2': {
'os:linux': {
'LIBS': ['bz2']
@@ -428,6 +435,9 @@ CCTEST_EXTRA_FLAGS = {
'os:win32': {
'LIBS': ['winmm', 'ws2_32']
},
+ 'os:netbsd': {
+ 'LIBS': ['execinfo', 'pthread']
+ },
'arch:arm': {
'LINKFLAGS': ARM_LINK_FLAGS
},
@@ -487,6 +497,10 @@ SAMPLE_FLAGS = {
'os:win32': {
'LIBS': ['winmm', 'ws2_32']
},
+ 'os:netbsd': {
+ 'LIBPATH' : ['/usr/pkg/lib'],
+ 'LIBS': ['execinfo', 'pthread']
+ },
'arch:arm': {
'LINKFLAGS': ARM_LINK_FLAGS,
'armeabi:soft' : {
@@ -818,6 +832,9 @@ D8_FLAGS = {
'os:win32': {
'LIBS': ['winmm', 'ws2_32'],
},
+ 'os:netbsd': {
+ 'LIBS': ['pthread'],
+ },
'arch:arm': {
'LINKFLAGS': ARM_LINK_FLAGS
},
@@ -951,7 +968,7 @@ PLATFORM_OPTIONS = {
'help': 'the architecture to build for'
},
'os': {
- 'values': ['freebsd', 'linux', 'macos', 'win32', 'openbsd', 'solaris', 'cygwin'],
+ 'values': ['freebsd', 'linux', 'macos', 'win32', 'openbsd', 'solaris', 'cygwin', 'netbsd'],
'guess': GuessOS,
'help': 'the os to build for'
},