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 /third_party/bzip2 | |
| 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 'third_party/bzip2')
| -rw-r--r-- | third_party/bzip2/SConscript | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/third_party/bzip2/SConscript b/third_party/bzip2/SConscript index 1457400..0ff0fab 100644 --- a/third_party/bzip2/SConscript +++ b/third_party/bzip2/SConscript @@ -27,16 +27,23 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
+Import('PLATFORM')
+
Import('env')
env = env.Clone()
+if PLATFORM == 'WINDOWS':
+ env.Append(
+ CCFLAGS = [
+ '/TC',
+ '/wd4996',
+ '/wd4800',
+ ],
+ )
+
env.Append(
- CCFLAGS = [
- '/TC',
- '/wd4996',
- '/wd4800',
- ],
CPPDEFINES = [
'BZ_NO_STDIO',
],
|