diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-09-20 20:53:50 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-09-20 20:53:50 +0200 |
| commit | b6b7eb97b48937132638aeeef18270624201a930 (patch) | |
| tree | d0b81e3b12fca8ecea389b8ec86b61ee2a51f22e | |
| parent | a87a8ee5a1919f6f6b4b35668456c03bdd499c85 (diff) | |
Revert "Call macosx-change-install-names on executables in gbuild, too."
This reverts commit a87a8ee5a1919f6f6b4b35668456c03bdd499c85.
The cherry-pick was premature, it would have required an unfortunate number of
follow-up commits to be picked too.
Signed-off-by: Norbert Thiebaud <nthiebaud@gmail.com>
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
| -rwxr-xr-x | solenv/gbuild/platform/macosx.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index ff7333389..2def0c982 100755 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -274,8 +274,6 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ -o $(1) \ `cat $${DYLIB_FILE}` && \ - $(if $(filter Executable,$(TARGETTYPE)),\ - $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable $(LAYER) $(1) &&) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \ ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \ |