Source release v3.2.0
This commit is contained in:
17
third_party/gyp/generator/make.py
vendored
17
third_party/gyp/generator/make.py
vendored
@@ -31,6 +31,8 @@ import gyp.xcode_emulation
|
||||
from gyp.common import GetEnvironFallback
|
||||
from gyp.common import GypError
|
||||
|
||||
import hashlib
|
||||
|
||||
generator_default_variables = {
|
||||
'EXECUTABLE_PREFIX': '',
|
||||
'EXECUTABLE_SUFFIX': '',
|
||||
@@ -90,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)')
|
||||
|
||||
@@ -1347,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':
|
||||
@@ -1743,7 +1751,10 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
|
||||
# actual command.
|
||||
# - The intermediate recipe will 'touch' the intermediate file.
|
||||
# - The multi-output rule will have an do-nothing recipe.
|
||||
intermediate = "%s.intermediate" % (command if command else self.target)
|
||||
|
||||
# Hash the target name to avoid generating overlong filenames.
|
||||
cmddigest = hashlib.sha1(command if command else self.target).hexdigest()
|
||||
intermediate = "%s.intermediate" % (cmddigest)
|
||||
self.WriteLn('%s: %s' % (' '.join(outputs), intermediate))
|
||||
self.WriteLn('\t%s' % '@:');
|
||||
self.WriteLn('%s: %s' % ('.INTERMEDIATE', intermediate))
|
||||
|
||||
Reference in New Issue
Block a user