diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2010-01-06 02:46:23 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-01-06 02:46:23 +0000 |
| commit | 6a8abe1a91e0ca25fa3cbec2a2ab4b3ff7bb6538 (patch) | |
| tree | 586e8b3e68897ee023887c483f702e4737786784 /makefiles/Makefile.tools | |
| parent | 2caf862540fe24a7b42a1cc363187db142ae539c (diff) | |
| download | buildsystem-6a8abe1a91e0ca25fa3cbec2a2ab4b3ff7bb6538.tar.gz buildsystem-6a8abe1a91e0ca25fa3cbec2a2ab4b3ff7bb6538.tar.bz2 | |
Revert previous changes. It turns out that, despite what the documentation says, when targetting RISC OS, the soname should be in the form libfoo.so.major, and *not* libfoo/so/major.
However, when we create the installed symlinks and are targetting RISC OS, the symlink targets must be of the form libfoo/so/major/minor/patch, and not libfoo.so.major.minor.patch. To add extra complexity, when we're building for RISC OS, but installing in a cross-compilation environment, we want the symlinks to be valid on Unix hosts, which means libfoo.so.major.minor.patch.
The upshot of all this is that we simply cannot perform the appropriate magic in the buildsystem makefiles as they have no knowledge of whether they're installing into a cross-compilation or a target environment. Nor should they care about this, either. Therefore, the place where we get to massage the target name is in ro-ln.
svn path=/trunk/tools/buildsystem/; revision=9791
Diffstat (limited to 'makefiles/Makefile.tools')
| -rw-r--r-- | makefiles/Makefile.tools | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 3bbaa77..3b87a07 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -291,11 +291,7 @@ ifeq ($(COMPONENT_TYPE),lib-shared) # Default CFLAGS/LDFLAGS for shared libraries SHAREDCFLAGS ?= -fPIC -DPIC SHAREDCXXFLAGS ?= -fPIC -DPIC - ifeq ($(TARGET),riscos) - SHAREDLDFLAGS ?= -shared -Wl,-soname,$(subst .,/,$(SONAME)) - else - SHAREDLDFLAGS ?= -shared -Wl,-soname,$(SONAME) - endif + SHAREDLDFLAGS ?= -shared -Wl,-soname,$(SONAME) SHAREDLDPATH ?= LD_LIBRARY_PATH="$(BUILDDIR):$(LD_LIBRARY_PATH)" endif |