diff options
| author | Stewart Addison <sxa@uk.ibm.com> | 2016-11-14 13:41:31 +0000 |
|---|---|---|
| committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2016-11-22 14:20:07 -0500 |
| commit | 625a2716c6fccfb1ff0006e11ab82bd05ab48168 (patch) | |
| tree | c855a9119cab8c12ea0bbd8a762fea1ecc0d4676 /tools/gyp/pylib/gyp/generator/make.py | |
| parent | 245a92894bdc15d7120370bccd6d7ee943333ba9 (diff) | |
| download | android-node-v8-625a2716c6fccfb1ff0006e11ab82bd05ab48168.tar.gz android-node-v8-625a2716c6fccfb1ff0006e11ab82bd05ab48168.tar.bz2 android-node-v8-625a2716c6fccfb1ff0006e11ab82bd05ab48168.zip | |
deps: backport GYP fix to fix AIX shared suffix
Required to support the shared library builds on AIX - this sets the
shared library suffix within GYP to .a instead of .so on AIX
My patch: https://codereview.chromium.org/2492233002/ was landed as
as part of this one which fixed some other (not required, but
included for completeness of the backport) changes:
Ref: https://codereview.chromium.org/2511733005/
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/make.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/make.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index 4a6b283f15..39373b9844 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -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': |