diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 18:09:13 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 18:09:13 +0000 |
| commit | d00f8dcf1ab8f6af0b1a7c2c160615962d76c122 (patch) | |
| tree | f699793603c201998f97d0d45d0f0207cb12b7c4 /chrome/SConstruct | |
| parent | 0b48d60dd5fbb2175617959798d52bbb58946779 (diff) | |
| download | chromium_src-d00f8dcf1ab8f6af0b1a7c2c160615962d76c122.zip chromium_src-d00f8dcf1ab8f6af0b1a7c2c160615962d76c122.tar.gz chromium_src-d00f8dcf1ab8f6af0b1a7c2c160615962d76c122.tar.bz2 | |
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
Diffstat (limited to 'chrome/SConstruct')
| -rw-r--r-- | chrome/SConstruct | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/chrome/SConstruct b/chrome/SConstruct index 60245b9..04808bc 100644 --- a/chrome/SConstruct +++ b/chrome/SConstruct @@ -28,13 +28,5 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
build_component = 'chrome'
-
-# 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'])
|