diff options
| author | Karel Gardas <karel.gardas@centrum.cz> | 2011-04-08 18:53:42 +0200 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-08 21:10:00 +0100 |
| commit | e7f04c3b08e13c4db266afaa8899a4a84f489478 (patch) | |
| tree | 29ba91a71382a088cc1fe503f3603fb84ab719c0 /mk | |
| parent | 814edf44433801e37318ce79082ac6991dbc87dd (diff) | |
| download | haskell-e7f04c3b08e13c4db266afaa8899a4a84f489478.tar.gz | |
- disable shared lib support on Solaris 10 and older (fixes #4973)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 13 | ||||
| -rw-r--r-- | mk/project.mk.in | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 4de412e6bc..e5b68114d3 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -104,13 +104,18 @@ GhcDynamic=NO GhcProfiled=NO # Do we support shared libs? -PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),\ - i386-unknown-linux x86_64-unknown-linux \ +SharedLibsPlatformList = i386-unknown-linux x86_64-unknown-linux \ i386-unknown-freebsd x86_64-unknown-freebsd \ i386-unknown-openbsd x86_64-unknown-openbsd \ i386-unknown-mingw32 \ - i386-unknown-solaris2 \ - i386-apple-darwin powerpc-apple-darwin),YES,NO) + i386-apple-darwin powerpc-apple-darwin + +ifeq ($(SOLARIS_BROKEN_SHLD), NO) +SharedLibsPlatformList := $(SharedLibsPlatformList) i386-unknown-solaris2 +endif + +PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),\ + $(SharedLibsPlatformList)),YES,NO) # Build a compiler that will build *unregisterised* libraries and # binaries by default. Unregisterised code is supposed to compile and diff --git a/mk/project.mk.in b/mk/project.mk.in index 3ceef15f30..58b0f1a028 100644 --- a/mk/project.mk.in +++ b/mk/project.mk.in @@ -139,3 +139,7 @@ endif # This distinguishes "msys" and "cygwin", which are not # not distinguished by HOST_OS_CPP OSTYPE=@OSTYPE@ + +# In case of Solaris OS, does it provide broken shared libs +# linker or not? +SOLARIS_BROKEN_SHLD=@SOLARIS_BROKEN_SHLD@ |