forked from cory/tildefriends
		
	Building V8 is an adventure every time.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3410 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
		| @@ -74,8 +74,8 @@ elif sys.platform == 'darwin': | |||||||
| 		os.path.join(uv, 'build/Release'), | 		os.path.join(uv, 'build/Release'), | ||||||
| 	]) | 	]) | ||||||
| else: | else: | ||||||
| 	env.Append(LIBS=['pthread', 'uv', 'rt', 'dl']) | 	env.Append(LIBS=['uv', 'rt', 'dl', 'pthread']) | ||||||
| 	env.Append(CXXFLAGS=['--std=c++0x', '-g', '-Wall']) | 	env.Append(CXXFLAGS=['--std=c++11', '-g', '-Wall']) | ||||||
| 	env.Append(CFLAGS=['-g', '-Wall']) | 	env.Append(CFLAGS=['-g', '-Wall']) | ||||||
| 	env.Append(LINKFLAGS=['-g']) | 	env.Append(LINKFLAGS=['-g']) | ||||||
| 	env.Append(LIBPATH=[ | 	env.Append(LIBPATH=[ | ||||||
| @@ -95,6 +95,7 @@ env.Append(LIBS=[lmdb]) | |||||||
|  |  | ||||||
| if sys.platform == 'linux2': | if sys.platform == 'linux2': | ||||||
| 	env.Append(LIBS=['crypto', 'ssl']) | 	env.Append(LIBS=['crypto', 'ssl']) | ||||||
|  | 	env.Append(LINKFLAGS=['-std=c++0x']) | ||||||
|  |  | ||||||
| source = [s for s in Glob('build/src/*.cpp') if not os.path.basename(str(s)).startswith("SecureSocket_")] | source = [s for s in Glob('build/src/*.cpp') if not os.path.basename(str(s)).startswith("SecureSocket_")] | ||||||
| if sys.platform == 'darwin': | if sys.platform == 'darwin': | ||||||
|   | |||||||
| @@ -21,11 +21,11 @@ if not os.path.isdir(kWork): | |||||||
| os.chdir(kWork) | os.chdir(kWork) | ||||||
|  |  | ||||||
| kUvRepository = 'https://github.com/libuv/libuv.git' | kUvRepository = 'https://github.com/libuv/libuv.git' | ||||||
| kUvBranch = 'v1.11.0' | kUvBranch = 'v1.16.1' | ||||||
| kUvWork = 'uv' | kUvWork = 'uv' | ||||||
|  |  | ||||||
| kV8Repository = 'https://github.com/v8/v8.git' | kV8Repository = 'https://github.com/v8/v8.git' | ||||||
| kV8Branch = 'branch-heads/6.0' | kV8Branch = 'branch-heads/6.2' | ||||||
| kV8Work = 'v8' | kV8Work = 'v8' | ||||||
|  |  | ||||||
| kLmdbRepository = 'https://github.com/LMDB/lmdb.git' | kLmdbRepository = 'https://github.com/LMDB/lmdb.git' | ||||||
| @@ -149,7 +149,10 @@ def updateV8(): | |||||||
| 	else: | 	else: | ||||||
| 		run(['gclient' + extension, 'sync'], cwd=kV8Work) | 		run(['gclient' + extension, 'sync'], cwd=kV8Work) | ||||||
|  |  | ||||||
| 	run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env) | 	if sys.platform == 'linux2': | ||||||
|  | 		run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false v8_static_library=true is_clang=false use_sysroot=false treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env) | ||||||
|  | 	else: | ||||||
|  | 		run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false v8_static_library=true treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env) | ||||||
| 	run(['ninja', '-C', 'out'], cwd=kV8Work) | 	run(['ninja', '-C', 'out'], cwd=kV8Work) | ||||||
|  |  | ||||||
| if __name__ == '__main__': | if __name__ == '__main__': | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user