2 files changed, 24 insertions, 19 deletions
diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript
index 7b1ed3a..826fe0d 100644
--- a/chrome/tools/test/image_diff/SConscript
+++ b/chrome/tools/test/image_diff/SConscript
@@ -27,25 +27,26 @@ env_test.Prepend(
     ],
 )
 
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/SUBSYSTEM:CONSOLE',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-)
+if env_test['PLATFORM'] == 'win32':
+    env_test.Prepend(
+        LINKFLAGS = [
+            '/INCREMENTAL',
+            '/DEBUG',
+
+            '/DELAYLOAD:"dwmapi.dll"',
+            '/DELAYLOAD:"uxtheme.dll"',
+
+            '/SUBSYSTEM:CONSOLE',
+
+            '/MACHINE:X86',
+            '/FIXED:No',
+
+            '/safeseh',
+            '/dynamicbase',
+            '/ignore:4199',
+            '/nxcompat',
+        ],
+    )
 
 input_files = [
     'image_diff.cc',
diff --git a/chrome/tools/test/image_diff/image_diff.cc b/chrome/tools/test/image_diff/image_diff.cc
index fabd38f..7b696d4 100644
--- a/chrome/tools/test/image_diff/image_diff.cc
+++ b/chrome/tools/test/image_diff/image_diff.cc
@@ -234,7 +234,11 @@ int CompareImages(const char* file1, const char* file2) {
 
 int main(int argc, const char* argv[]) {
   process_util::EnableTerminationOnHeapCorruption();
+#if defined(OS_WIN)
   CommandLine parsed_command_line;
+#elif defined(OS_POSIX)
+  CommandLine parsed_command_line(argc, argv);
+#endif
   if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
     // Watch stdin for filenames.
     std::string stdin_buffer;