Chromium Code Reviews| Index: pylib/gyp/generator/make.py |
| diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py |
| index 0db84292047bab4aa4003e055567216e6c6f78ff..c6ed37a13b13b14e4ab71c15f276322a1d4e4728 100644 |
| --- a/pylib/gyp/generator/make.py |
| +++ b/pylib/gyp/generator/make.py |
| @@ -1,4 +1,4 @@ |
| -# Copyright (c) 2013 Google Inc. All rights reserved. |
| +# Copyright (c) 2016 The Chromium Authors. All rights reserved. |
|
Dirk Pranke
2016/11/14 21:28:38
I *think* this needs to stay as Google, actually,
|
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| @@ -92,7 +92,10 @@ def CalculateVariables(default_variables, params): |
| if flavor == 'android': |
| operating_system = 'linux' # Keep this legacy behavior for now. |
| default_variables.setdefault('OS', operating_system) |
| - default_variables.setdefault('SHARED_LIB_SUFFIX', '.so') |
| + if flavor == 'aix': |
| + default_variables.setdefault('SHARED_LIB_SUFFIX', '.a') |
| + else: |
| + default_variables.setdefault('SHARED_LIB_SUFFIX', '.so') |
| default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)') |
| default_variables.setdefault('LIB_DIR', '$(obj).$(TOOLSET)') |
| @@ -1349,7 +1352,10 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD |
| if target[:3] == 'lib': |
| target = target[3:] |
| target_prefix = 'lib' |
| - target_ext = '.so' |
| + if self.flavor == 'aix': |
| + target_ext = '.a' |
| + else: |
| + target_ext = '.so' |
| elif self.type == 'none': |
| target = '%s.stamp' % target |
| elif self.type != 'executable': |