diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:48:34 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:48:34 +0000 |
commit | 1ddaa21f25dd09d44a49a7407480072f251f8333 (patch) | |
tree | 858c8b367588d6c1cb4de8fcc989ea2cfcefa6ef /libxslt | |
parent | feaeb953e72da6a6b260f8c536e25c0322fdf92e (diff) |
CWS-TOOLING: integrate CWS hr58
2008-12-29 16:47:08 +0100 hr r265821 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (x86)
2008-12-18 16:16:11 +0100 hr r265701 : #i97331#: revert to revision r265576
2008-12-18 16:00:41 +0100 hr r265699 : #i97331#: fix typo in last change
2008-12-17 18:16:18 +0100 hr r265653 : #i97331#: add comment
2008-12-17 18:11:11 +0100 hr r265652 : #i97331#: make -xc99=all again dependend on SYSBASEROOT being set
2008-12-17 01:54:23 +0100 hr r265576 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (Sparc)
Diffstat (limited to 'libxslt')
-rw-r--r-- | libxslt/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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)"!="" |