Commit 62a50a0a authored by kcconley@gmail.com's avatar kcconley@gmail.com

GN bootstrap.py: fixed cross-compile, etc.

+ Use env var LD (default to CXX)
+ Exclude run_all_unittests.cc from build

NOTRY=true
R=brettw@chromium.org
BUG=

Review URL: https://codereview.chromium.org/445713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288001 0039d316-1c4b-4281-b951-d872f2087c98
parent 5c5d8a6a
...@@ -107,6 +107,7 @@ def write_ninja(path, options): ...@@ -107,6 +107,7 @@ def write_ninja(path, options):
cxx = os.environ.get('CXX', '') cxx = os.environ.get('CXX', '')
cflags = os.environ.get('CFLAGS', '').split() cflags = os.environ.get('CFLAGS', '').split()
cflags_cc = os.environ.get('CXXFLAGS', '').split() cflags_cc = os.environ.get('CXXFLAGS', '').split()
ld = os.environ.get('LD', cxx)
ldflags = os.environ.get('LDFLAGS', '').split() ldflags = os.environ.get('LDFLAGS', '').split()
include_dirs = [SRC_ROOT] include_dirs = [SRC_ROOT]
libs = [] libs = []
...@@ -117,7 +118,7 @@ def write_ninja(path, options): ...@@ -117,7 +118,7 @@ def write_ninja(path, options):
else: else:
cflags.extend(['-O2', '-g0']) cflags.extend(['-O2', '-g0'])
cflags.extend(['-D_FILE_OFFSET_BITS=64 -pthread', '-pipe']) cflags.extend(['-D_FILE_OFFSET_BITS=64', '-pthread', '-pipe'])
cflags_cc.extend(['-std=gnu++11', '-Wno-c++11-narrowing']) cflags_cc.extend(['-std=gnu++11', '-Wno-c++11-narrowing'])
static_libraries = { static_libraries = {
...@@ -131,7 +132,7 @@ def write_ninja(path, options): ...@@ -131,7 +132,7 @@ def write_ninja(path, options):
continue continue
if name.endswith('_unittest.cc'): if name.endswith('_unittest.cc'):
continue continue
if name in ['generate_test_gn_data.cc']: if name in ['generate_test_gn_data.cc', 'run_all_unittests.cc']:
continue continue
full_path = os.path.join(GN_ROOT, name) full_path = os.path.join(GN_ROOT, name)
static_libraries['gn']['sources'].append( static_libraries['gn']['sources'].append(
...@@ -377,11 +378,15 @@ def write_ninja(path, options): ...@@ -377,11 +378,15 @@ def write_ninja(path, options):
ninja_lines.extend([ ninja_lines.extend([
'build gn: link %s' % ( 'build gn: link %s' % (
' '.join(['%s.a' % library for library in static_libraries])), ' '.join(['%s.a' % library for library in static_libraries])),
' ld = $ldxx',
' ldflags = %s' % ' '.join(ldflags), ' ldflags = %s' % ' '.join(ldflags),
' libs = %s' % ' '.join(libs), ' libs = %s' % ' '.join(libs),
'', # Make sure the file ends with a newline.
]) ])
if ld:
ninja_lines.append(' ld = %s' % ld)
else:
ninja_lines.append(' ld = $ldxx')
ninja_lines.append('') # Make sure the file ends with a newline.
with open(path, 'w') as f: with open(path, 'w') as f:
f.write(ninja_template + '\n'.join(ninja_lines)) f.write(ninja_template + '\n'.join(ninja_lines))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment