diff options
| author | keunwoo@google.com <keunwoo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 20:21:49 +0000 |
|---|---|---|
| committer | keunwoo@google.com <keunwoo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 20:21:49 +0000 |
| commit | fab9aa315dc98e34136697ed9719bb867ceb36c5 (patch) | |
| tree | c92047f9aa0c9ac68b72fe377600f81ca7b97b24 /chrome | |
| parent | ba1ea30afdd071646a634f054a410a004b60f797 (diff) | |
| download | chromium_src-fab9aa315dc98e34136697ed9719bb867ceb36c5.zip chromium_src-fab9aa315dc98e34136697ed9719bb867ceb36c5.tar.gz chromium_src-fab9aa315dc98e34136697ed9719bb867ceb36c5.tar.bz2 | |
Initial commit to get a handful of third_party packages building properly under Linux. Uses some temporary shims to detect platform and omit processing of some stuff that doesn't seem to work for me.
As previously discussed, I'm just doing whatever's expedient to getting *something* building under Linux, since we decided with the current state of Chrome head (with the upcoming freeze and release branch) it would be too disruptive to try to land all the latest site_scons in Chrome's copy. The main thing to note is the SConscript.main.linux file which uses
#/../third_party/*
instead of
#/$BUILD_ROOT/third_party/*
and then uses variant_dir in the env.SConscript() call at the bottom to explicitly emit output into Hammer/third_party/*. If either of these hacks is absent, scons under Linux simply concludes that all targets are up to date (there's nothing to build). Explanations for this behavior or alternative workarounds are welcome. Alternatively we could just commit this as-is and let someone with more knowledge of SCons internals try to debug it under Linux.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConstruct | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/chrome/SConstruct b/chrome/SConstruct index 04808bc..f8ea244 100644 --- a/chrome/SConstruct +++ b/chrome/SConstruct @@ -28,5 +28,24 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
build_component = 'chrome'
-SConscript('../build/SConscript.main',
- exports=['build_component'])
+
+# TODO(keunwoo): This is an ugly hack to reify the result of scons's built-in
+# platform detection as a variable (the RES attribute is only available
+# under MSWindows). Once rspangler+sgk merge better idioms into Chrome's
+# site scons, we should be able to remove this.
+try:
+ Environment().RES
+except AttributeError:
+ PLATFORM = 'LINUX'
+else:
+ PLATFORM = 'WINDOWS'
+
+# TODO(keunwoo): Merge ../build/SConscript.main.linux back to SConscript.main,
+# then remove this.
+if PLATFORM == 'LINUX':
+ SCONSCRIPT_MAIN = '../build/SConscript.main.linux'
+else:
+ SCONSCRIPT_MAIN = '../build/SConscript.main'
+
+SConscript(SCONSCRIPT_MAIN,
+ exports=['build_component', 'PLATFORM'])
|