From d00f8dcf1ab8f6af0b1a7c2c160615962d76c122 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Tue, 12 Aug 2008 18:09:13 +0000 Subject: Get rid of separate SConscript.main.linux: * Set -j default to %NUMBER_OF_PROCESSORS% + 1 only on Windows. * Initialize LOAD= modules up front, and let Linux override to the subset that are currently building. * Initialize Linux CCFLAGS, LINKFLAGS and LIBS in a separate if-clause (like we do for Windows). * Remove SCONSCRIPT_MAIN code in {base,chrome}/SConstruct in favor of just call ../build/SConscript.main. * Merge in evanm's changes to base/SConscript for separate lists of platform-neutral and platform-specific source files and test files. R=evanm,deanm git-svn-id: svn://svn.chromium.org/chrome/trunk/src@727 0039d316-1c4b-4281-b951-d872f2087c98 --- base/SConstruct | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'base/SConstruct') diff --git a/base/SConstruct b/base/SConstruct index 692da7a..c64037f 100644 --- a/base/SConstruct +++ b/base/SConstruct @@ -28,13 +28,5 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. build_component = 'base' - -# TODO(keunwoo): Merge ../build/SConscript.main.linux back to SConscript.main, -# then remove this. -if Environment()['PLATFORM'] == 'posix': - SCONSCRIPT_MAIN = '../build/SConscript.main.linux' -else: - SCONSCRIPT_MAIN = '../build/SConscript.main' - -SConscript(SCONSCRIPT_MAIN, +SConscript('../build/SConscript.main', exports=['build_component']) -- cgit v1.1