diff options
| -rw-r--r-- | icu/makefile.mk | 5 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 4 | ||||
| -rw-r--r-- | python/makefile.mk | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index f363155780b5..5a1a1d258f63 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -65,7 +65,10 @@ icu_CFLAGS+=-I$(SYSBASE)$/usr$/include .IF "$(COMNAME)"=="sunpro5" icu_CFLAGS+=$(C_RESTRICTIONFLAGS) .ENDIF # "$(COMNAME)"=="sunpro5" -icu_LDFLAGS+=-L$(SYSBASE)$/usr$/lib +# add SYSBASE libraries and make certain that they are found *after* the +# icu build internal libraries - in case that icu is available in SYSBASE +# as well +icu_LDFLAGS+= -L../../lib -L../../stubdata -L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" .IF "$(OS)"=="MACOSX" diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index d73c0ffc04ec..a0590873c841 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -86,9 +86,9 @@ LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" .IF "$(SYSBASE)"!="" -CPPFLAGS+:=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS) +CPPFLAGS+:=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include $(EXTRA_CFLAGS) .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl +LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" diff --git a/python/makefile.mk b/python/makefile.mk index 0bcdf9754546..66532174defc 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -105,7 +105,7 @@ python_LDFLAGS+=-Wl,-z,noexecstack # SunStudio on Solaris 10 and above needs the -xc99=all flag already # during the configuration tests, otherwise the HAVE_LIMITS_H check will # be wrong resulting in a build breaker. -.IF "$(SYSBASE)"=="" || "$(OS)$(CPU)"=="SOLARISU" +.IF "$(OS)"=="SOLARIS" .IF "$(COMNAME)"=="sunpro5" CC+:=-xc99=all .ENDIF # "$(COMNAME)"=="sunpro5" |