| Index: dart.gyp
 | 
| diff --git a/dart.gyp b/dart.gyp
 | 
| index f67ba659393fb164e25e75155f6d7dd0c486ed0a..1b62e45af165c3358b8180c1af485ce725034bdf 100644
 | 
| --- a/dart.gyp
 | 
| +++ b/dart.gyp
 | 
| @@ -30,7 +30,6 @@
 | 
|        'dependencies': [
 | 
|          'runtime/dart-runtime.gyp:dart',
 | 
|          'dart2js',
 | 
| -        'compiler',
 | 
|        ],
 | 
|        'actions': [
 | 
|          {
 | 
| @@ -42,7 +41,6 @@
 | 
|              '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
 | 
|              '<(PRODUCT_DIR)/dart2js',
 | 
|              '<(PRODUCT_DIR)/dart2js.bat',
 | 
| -            '<(PRODUCT_DIR)/analyzer/bin/dart_analyzer'
 | 
|            ],
 | 
|            'outputs': [
 | 
|              '<(PRODUCT_DIR)/dart-sdk/create.stamp',
 | 
| @@ -53,8 +51,22 @@
 | 
|              '<(PRODUCT_DIR)/dart-sdk',
 | 
|            ],
 | 
|            'message': 'Creating SDK.',
 | 
| +          'conditions' : [
 | 
| +            ['(OS=="linux" or OS=="mac") ', {
 | 
| +              'inputs' : [
 | 
| +                '<(PRODUCT_DIR)/analyzer/bin/dart_analyzer'
 | 
| +              ],
 | 
| +            }],
 | 
| +          ],
 | 
|          },
 | 
|        ],
 | 
| +      'conditions' : [
 | 
| +        ['(OS=="linux" or OS=="mac") ', {
 | 
| +          'dependencies': [
 | 
| +            'compiler',
 | 
| +          ],
 | 
| +        }],
 | 
| +      ],
 | 
|      },
 | 
|      {
 | 
|        # Upload the SDK. This target is separate from create_sdk as the
 | 
| 
 |