summaryrefslogtreecommitdiff
path: root/solenv/inc/unxsolu4.mk
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-02-09 10:49:18 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-02-09 20:18:11 +0100
commit354f09c75e883fbc3fc9302310941d0211762796 (patch)
treea36e226160c5390b72d8a0442260ff07bf531cc4 /solenv/inc/unxsolu4.mk
parentc296fe08de3958707d8fc4c2d3131cbcdbc60f1b (diff)
Removing the ext_std masterpiece
Diffstat (limited to 'solenv/inc/unxsolu4.mk')
-rw-r--r--solenv/inc/unxsolu4.mk12
1 files changed, 2 insertions, 10 deletions
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 406c211e82c1..b79a33e73674 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -55,7 +55,7 @@ CC*=cc
CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp
CFLAGSCC=-xCC $(ARCH_FLAGS)
-CFLAGSCXX= -features=no%altspell -library=stlport4 $(ARCH_FLAGS)
+CFLAGSCXX= -features=no%altspell $(ARCH_FLAGS)
# flags to enable build with symbols; required for crashdump feature
CFLAGSENABLESYMBOLS=-g0 -xs # was temporarily commented out, reenabled before Beta
@@ -138,7 +138,7 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_BOXT=-R\''$$ORIGIN/../../../basis-link/program'\'
LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4
+LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
LINKCFLAGS=-m64 -w -mt -z combreloc -norunpath
# -z text force fatal error if non PIC code is linked into shared library. Such code
@@ -199,14 +199,6 @@ STDSHLGUIMT+=-lX11 -ldl
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
LIBSALCPPRT=
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro_debug
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro_debug $(DYNAMIC)
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro
-LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC)
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-
LIBMGR=CC
LIBFLAGS=-xar -o