View | Details | Raw Unified | Return to issue 8230
Collapse All | Expand All

(-)solenv/inc/unxirgm.mk (-30 / +40 lines)
Lines 11-26 Link Here
11
#              couldn't be instantiated.
11
#              couldn't be instantiated.
12
#              (ts&sdo/10.06.98)
12
#              (ts&sdo/10.06.98)
13
#
13
#
14
#cc=                   cc -KPIC -c -n32 -ansi
14
CC=                    gcc -c
15
CC=                    gcc                     ## remove this to configure
15
CXX=                   g++
16
#CC=           CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
17
CXX=           g++ -c          ## remove this to configure -c should be in cflags
18
CFLAGS=                $(INCLUDE)
16
CFLAGS=                $(INCLUDE)
19
CDEFS+=        -DSOLAR_JAVA
17
CDEFS+=        -DVCL -D_PTHREADS -DSTLPORT_VERSION=0x450  -D_USE_NAMESPACE=1 -DHAVE_UNISTD_H
20
# CFLAGS+=     -D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include
18
CFLAGSCC=       -c -fpermissive
21
# CFLAGS+=     -D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include
19
CFLAGSCXX=     -fno-for-scope -fpermissive  -c
22
CFLAGSCC=       -c
23
CFLAGSCXX=     -fno-for-scope -fpermissive
24
CFLAGSOBJGUIST=
20
CFLAGSOBJGUIST=
25
CFLAGSOBJCUIST=
21
CFLAGSOBJCUIST=
26
CFLAGSOBJGUIMT=
22
CFLAGSOBJGUIMT=
Lines 29-37 Link Here
29
CFLAGSSLOCUIMT= -fpic
25
CFLAGSSLOCUIMT= -fpic
30
CFLAGSPROF=
26
CFLAGSPROF=
31
CFLAGSDEBUG=   -g
27
CFLAGSDEBUG=   -g
32
CFLAGSDBGUTIL=
28
CFLAGSDBGUTIL= 
33
CFLAGSOPT=             -O2
29
CFLAGSOPT=             -O2
34
CFLAGSNOOPT=           -O
30
CFLAGSNOOPT=           -O0
35
CFLAGSOUTOBJ=  -o
31
CFLAGSOUTOBJ=  -o
36
STATIC=                        -Wl,-Bstatic
32
STATIC=                        -Wl,-Bstatic
Lines 43-64 Link Here
43
# -update_registry <file> :    Is needed to link several shared libraries
39
# -update_registry <file> :    Is needed to link several shared libraries
44
#                              **VALID MECHANISM SOMETIMES MISSING FOR LOCAL STANDS**
40
#                              **VALID MECHANISM SOMETIMES MISSING FOR LOCAL STANDS**
45
#
41
#
46
LINK=                  g++
42
# To use the map files, you need to have a gcc_specs file which contains:
47
LINKFLAGS=     -L/usr/lib32    
43
# *linker:
48
LINKFLAGSAPPGUI= -Wl,-multigot
44
# /path/to/bin/ld.sh
49
LINKFLAGSAPPCUI= -Wl,-multigot
45
# where ld.sh is a wrapper script that does some conversion of the map files on the fly.
50
46
51
LINKFLAGSSHLGUI= -shared
47
#LINK=                 g++ -specs=/projects/sise/openoffice/devel/workpits/STABLE_1/gcc_specs
52
LINKFLAGSSHLCUI= -shared
48
LINK=                  g++ 
49
LINKFLAGS=     -L/usr/lib32 -Wl,-no_unresolved
50
LINKVERSIONMAPFLAG= -Wl,-exports_file
51
52
.IF "$(TARGETTHREAD)"=="MT"
53
LINKFLAGSAPPGUI= $(THREADLIB) -Wl,-multigot -nodefaultlibs
54
LINKFLAGSAPPCUI= $(THREADLIB) -Wl,-multigot -nodefaultlibs
55
LINKFLAGSSHLGUI= $(THREADLIB) -shared -nodefaultlibs
56
LINKFLAGSSHLCUI= $(THREADLIB) -shared -nodefaultlibs
57
.ELSE
58
LINKFLAGSAPPGUI= -Wl,-multigot -nodefaultlibs
59
LINKFLAGSAPPCUI= -Wl,-multigot -nodefaultlibs
60
LINKFLAGSSHLGUI= -shared -nodefaultlibs
61
LINKFLAGSSHLCUI= -shared -nodefaultlibs
62
.ENDIF
53
63
54
LINKFLAGSTACK=
64
LINKFLAGSTACK=
55
LINKFLAGSPROF=
65
LINKFLAGSPROF=
56
LINKFLAGSDEBUG= -g
66
LINKFLAGSDEBUG= -g
57
LINKFLAGSOPT=
67
LINKFLAGSOPT=
58
68
59
LINKFLAGSSHLGUI += -Wl,-Bsymbolic
69
#LINKFLAGSSHLGUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
60
LINKFLAGSSHLCUI += -Wl,-Bsymbolic
70
#LINKFLAGSSHLCUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
61
71
SONAME_SWITCH = -Wl,-soname -Wl,
62
APPLINKSTATIC=-Bstatic
72
APPLINKSTATIC=-Bstatic
63
APPLINKSHARED=-Bsymbolic
73
APPLINKSHARED=-Bsymbolic
64
74
Lines 67-83 Link Here
67
STDSLOGUI=
77
STDSLOGUI=
68
STDOBJCUI=
78
STDOBJCUI=
69
STDSLOCUI=
79
STDSLOCUI=
70
# STDLIBGUIST= $(DYNAMIC) -lX11 -lc -lm
71
STDLIBGUIST=   $(DYNAMIC) -lX11 -lc -lm
80
STDLIBGUIST=   $(DYNAMIC) -lX11 -lc -lm
72
STDLIBCUIST=   $(DYNAMIC) -lc -lm
81
STDLIBCUIST=   $(DYNAMIC) -lgcc -lc
73
# STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
82
STDLIBGUIMT=   $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
74
STDLIBGUIMT=   $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
83
STDLIBCUIMT=   $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm
75
STDLIBCUIMT=   $(THREADLIB) $(DYNAMIC) -lc -lm
84
STDSHLGUIMT=   -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
76
# STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
85
STDSHLCUIMT=   -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc
77
STDSHLGUIMT=   -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
78
STDSHLCUIMT=   -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
79
THREADLIB=             -lpthread
86
THREADLIB=             -lpthread
80
87
88
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
89
LIBSTLPORTST= -lstlport_gcc
90
81
LIBMGR=                        ar
91
LIBMGR=                        ar
82
LIBFLAGS=              -r
92
LIBFLAGS=              -r
83
# LIBEXT=              .so
93
# LIBEXT=              .so
Lines 102-108 Link Here
102
DLLPOST=               .so
112
DLLPOST=               .so
103
113
104
114
105
LDUMP=
115
LDUMP=c++filt
106
116
107
STDLIBCPP = -lstdc++
117
STDLIBCPP = -lstdc++

Return to issue 8230