Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Side by Side Diff: build/SConscript.main

Issue 27054: Multiple fixes for broken Linux SHARED=1 build. (Closed)
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/browser.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import os 5 import os
6 import shutil 6 import shutil
7 import sys 7 import sys
8 8
9 9
10 if sys.platform == 'win32': 10 if sys.platform == 'win32':
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 472
473 # We have several cases where archives depend on each other in a cyclic 473 # We have several cases where archives depend on each other in a cyclic
474 # fashion. (V8Bindings, libport and WebCore being the most significant 474 # fashion. (V8Bindings, libport and WebCore being the most significant
475 # example.) Since the GNU linker does only a single pass over the archives 475 # example.) Since the GNU linker does only a single pass over the archives
476 # we need some extra trickery to deal with these unavoidable cycles. That 476 # we need some extra trickery to deal with these unavoidable cycles. That
477 # trickery is --start-group and --end-group (aka -( and -) ). That causes ld 477 # trickery is --start-group and --end-group (aka -( and -) ). That causes ld
478 # to loop over the group until no more undefined symbols are found. In an 478 # to loop over the group until no more undefined symbols are found. In an
479 # ideal world we would only make groups from those libraries which we knew 479 # ideal world we would only make groups from those libraries which we knew
480 # to be in cycles. However, that's tough with SCons, so we bodge it by 480 # to be in cycles. However, that's tough with SCons, so we bodge it by
481 # making all the archives a group by redefining the linking command here. 481 # making all the archives a group by redefining the linking command here.
482 SHLINKCOM = ('$SHLINK -shared -o $TARGET $SHLINKFLAGS $SOURCES ' 482 SHLINKCOM = ('$SHLINK -o $TARGET $SHLINKFLAGS $SOURCES '
483 '$_LIBDIRFLAGS ' 483 '$_LIBDIRFLAGS '
484 '-Wl,--start-group $_LIBFLAGS -Wl,--end-group'), 484 '-Wl,--start-group $_LIBFLAGS -Wl,--end-group'),
485 LINKCOM = ('$LINK -o $TARGET $LINKFLAGS $SOURCES ' 485 LINKCOM = ('$LINK -o $TARGET $LINKFLAGS $SOURCES '
486 '$_LIBDIRFLAGS ' 486 '$_LIBDIRFLAGS '
487 '-Wl,--start-group $_LIBFLAGS -Wl,--end-group'), 487 '-Wl,--start-group $_LIBFLAGS -Wl,--end-group'),
488 ) 488 )
489 489
490 linux_env.Replace( 490 linux_env.Replace(
491 PERL = '/usr/bin/perl', 491 PERL = '/usr/bin/perl',
492 PERL_INCLUDE_FLAG = '-I ', 492 PERL_INCLUDE_FLAG = '-I ',
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 'all_libraries', 839 'all_libraries',
840 'all_languages', 840 'all_languages',
841 'all_programs', 841 'all_programs',
842 'all_test_programs', 842 'all_test_programs',
843 ], projects = [p], 843 ], projects = [p],
844 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 844 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
845 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 845 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
846 ) 846 )
847 847
848 # ------------------------------------------------------------------------- 848 # -------------------------------------------------------------------------
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698