| OLD | NEW |
|---|
| (Empty) | |
| 1 Index: pylib/gyp/xcodeproj_file.py |
| 2 =================================================================== |
| 3 --- pylib/gyp/xcodeproj_file.py (revision 1246) |
| 4 +++ pylib/gyp/xcodeproj_file.py (working copy) |
| 5 @@ -2015,7 +2015,7 @@ |
| 6 |
| 7 def __repr__(self): |
| 8 props = self._properties |
| 9 - name = '%s.gyp:%s' % (props['containerPortal'].Name(), props['remoteInfo']) |
| 10 + name = '%s.gyp:%s %d' % (props['containerPortal'].Name(), props['remoteInfo
'], props['proxyType']) |
| 11 return '<%s %r at 0x%x>' % (self.__class__.__name__, name, id(self)) |
| 12 |
| 13 def Name(self): |
| 14 @@ -2117,8 +2117,7 @@ |
| 15 pbxproject = self.PBXProjectAncestor() |
| 16 other_pbxproject = other.PBXProjectAncestor() |
| 17 if pbxproject == other_pbxproject: |
| 18 - # The easy case. Add a dependency to another target in the same |
| 19 - # project file. |
| 20 + # Add a dependency to another target in the same project file. |
| 21 container = PBXContainerItemProxy({'containerPortal': pbxproject, |
| 22 'proxyType': 1, |
| 23 'remoteGlobalIDString': other, |
| 24 @@ -2127,8 +2126,7 @@ |
| 25 'targetProxy': container}) |
| 26 self.AppendProperty('dependencies', dependency) |
| 27 else: |
| 28 - # The hard case. Add a dependency to a target in a different project |
| 29 - # file. Actually, this case isn't really so hard. |
| 30 + # Add a dependency to a target in a different project file. |
| 31 other_project_ref = \ |
| 32 pbxproject.AddOrGetProjectReference(other_pbxproject)[1] |
| 33 container = PBXContainerItemProxy({ |
| 34 Index: pylib/gyp/generator/make.py |
| 35 =================================================================== |
| 36 --- pylib/gyp/generator/make.py (revision 1246) |
| 37 +++ pylib/gyp/generator/make.py (working copy) |
| 38 @@ -148,7 +148,7 @@ |
| 39 # - Set SONAME to the library filename so our binaries don't reference |
| 40 # the local, absolute paths used on the link command-line. |
| 41 quiet_cmd_solink = SOLINK($(TOOLSET)) $@ |
| 42 -cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -W
l,-soname=$(@F) -o $@ -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(
LIBS) |
| 43 +cmd_solink = $(LINK.$(TOOLSET)) -Wl,-all_load -shared $(GYP_LDFLAGS) $(LDFLAGS.
$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-wh
ole-archive $(LIBS) |
| 44 |
| 45 quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ |
| 46 cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLS
ET)) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -W
l,--end-group $(LIBS) |
| 47 Index: pylib/gyp/generator/ninja.py |
| 48 =================================================================== |
| 49 --- pylib/gyp/generator/ninja.py (revision 1246) |
| 50 +++ pylib/gyp/generator/ninja.py (working copy) |
| 51 @@ -1213,7 +1213,7 @@ |
| 52 'solink', |
| 53 description='SOLINK $out, POSTBUILDS', |
| 54 command=('$ld -shared $ldflags -o $out ' |
| 55 - '$in $libs$postbuilds')) |
| 56 + '$in -Wl,-all_load $libs$postbuilds')) |
| 57 master_ninja.rule( |
| 58 'solink_module', |
| 59 description='SOLINK(module) $out, POSTBUILDS', |
| OLD | NEW |
|---|
Chromium Code Reviews
