diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-26 02:39:57 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2004-04-26 02:39:57 +0000 |
| commit | a759a065c3ad4ac288e5770735b1928e857843bb (patch) | |
| tree | 5f9e5c463ee4cabc95f993ae5138c8a3d5f90ec3 /sv4Lib.rules | |
| parent | 21c3ff0a21a18bf7242fb92857245b19e9f34745 (diff) | |
xc/config/cf/sun.cf
xc/config/cf/sv4Lib.rules
xc/programs/Xserver/Imakefile
xc/programs/Xserver/hw/xfree86/os-support/sunos/find_deps.pl Make Solaris
builds work when using MakeDllModules (it's not the default yet, but at
least it works now if you turn it on) Also improve default compiler,
optimizer, & linker flags for Solaris builds using either Sun cc or gcc
xc/programs/Xserver/cfb/Imakefile.inc
xc/programs/Xserver/cfb/stipsparc.s
xc/programs/Xserver/cfb/stipsprc32.s Remove text relocation error when
building shared versions
Diffstat (limited to 'sv4Lib.rules')
| -rw-r--r-- | sv4Lib.rules | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sv4Lib.rules b/sv4Lib.rules index 803d9d5..bcecb32 100644 --- a/sv4Lib.rules +++ b/sv4Lib.rules @@ -24,6 +24,9 @@ XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.8tsi Exp $ #ifndef ShLibIncludeFile # define ShLibIncludeFile <sv4Lib.tmpl> #endif +#ifndef SharedLibraryLdCmd +# define SharedLibraryLdCmd $(LD) +#endif #ifndef SharedLibraryLoadFlags # define SharedLibraryLoadFlags -G -z text #endif @@ -85,17 +88,17 @@ install:: Concat(lib,libname.so.rev) @@\ #ifndef LinkWithExports # if UseExportLists # define LinkWithExports(libname,rev,solist,down,up) \ - (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) @@\ + (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) @@\ if [ -f Concat(lib,libname.elist) ]; then \ @@\ $(RM) down/$@.exports $@.list; \ @@\ $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \ @@\ $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \ @@\ - (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \ @@\ + (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \ @@\ $(RM) down/$@.exports $@.list; \ @@\ fi; # else # define LinkWithExports(libname,rev,solist,down,up) \ - (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) + (cd down; $(CCENVSETUP) SharedLibraryLdCmd -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) # endif #endif @@ -154,7 +157,7 @@ AllTarget(name) @@\ @@\ name: deps @@\ $(RM) $@~ @@\ - $(LD) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\ + SharedLibraryLdCmd -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ @@\ |