diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 21:32:20 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 21:32:20 +0000 |
| commit | 14d15d4d94826de272025415192e9f9edaf733c1 (patch) | |
| tree | 67a34aa679a42bfae84f9792f43b863128ca2243 /third_party/libjpeg | |
| parent | bdad42a47f2dfa5783554844d54337454256a0a3 (diff) | |
| download | chromium_src-14d15d4d94826de272025415192e9f9edaf733c1.zip chromium_src-14d15d4d94826de272025415192e9f9edaf733c1.tar.gz chromium_src-14d15d4d94826de272025415192e9f9edaf733c1.tar.bz2 | |
Get SCons building Windows again without having to Import()/re-Export(): use the $PLATFORM construction variable supplied in the construction environment instead of passing around our own PLATFORM variable in Python.
R=keunwoo,evanm
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjpeg')
| -rw-r--r-- | third_party/libjpeg/SConscript | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/libjpeg/SConscript b/third_party/libjpeg/SConscript index 3bd48d4..8010345 100644 --- a/third_party/libjpeg/SConscript +++ b/third_party/libjpeg/SConscript @@ -28,8 +28,6 @@ # 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()
@@ -40,7 +38,7 @@ env.Prepend( ],
)
-if PLATFORM == 'WINDOWS':
+if env['PLATFORM'] == 'win32':
env.Append(
CCFLAGS = [
'/TC',
|