Attachment #5608 for issue #12442

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




AC_ARG_ENABLE(symbols,
[  --enable-symbols        Include debugging symbols in output.  Warning -  
                          a complete build needs 8 Gb of space and takes 
                          much longer.  (enables -g compiler flag for gcc,
                          -Zi for MSVC)

],,)
AC_ARG_ENABLE(debug,
[  --enable-debug:         Include debugging symbols from --enable-symbols
                          plus extra debugging code.  Extra large build!
                          (enables -g compiler flag for gcc, -Zi for MSVC
                          and dmake debug=true)
],,)
AC_ARG_WITH(stlport4-home,
[  --with-stlport4-home    The location that STLport4 is installed in. The STL

dnl First setting is whether to include symbols into final build.
dnl ===================================================================
if test "$enable_symbols" = "yes"; then
   ENABLE_SYMBOLS="yes"
else
   ENABLE_SYMBOLS="no"
fi

dnl ===================================================================

AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_LIBS)
AC_SUBST(ENABLE_DEBUG)
AC_SUBST(ENABLE_SYMBOLS)

AC_OUTPUT([set_soenv])





if ( $COM ne "MSC" ) {
  ToFile( "LINK",			 $CC,				 "e" );
}
if ( "@ENABLE_SYMBOLS@" eq "yes" ) {
	if ( "$COM" eq "GCC" ) {
		ToFile( "ENVCFLAGS", "-g", "e" );
	} elsif ( "$COM" eq "MSC" ) {
	    # Set the switch(es) in wnt.mk, they are: "-Zi -Fd$(MISC)\$(PDBTARGET).PDB"
		ToFile( "ENABLE_SYMBOLS", "yes", "e" );
	} else {
		die "Don't know how to enable symbols for $COM" ;
	}
}
ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
if ($platform ne "$Winnt")

Lines 174-180 Link Here

(-)solenv/inc/wnt.mk (-1 / +4 lines)
174	.IF "$(seg)" == ""	174	.IF "$(seg)" == ""
175	.IF "$(demo)" == ""	175	.IF "$(demo)" == ""
176	CDEFS+= -D_X86_=1 $(OLE2DEF)	176	CDEFS+= -D_X86_=1 $(OLE2DEF)
177	CFLAGS+=-c -nologo -W3 -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE) -Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB	177	CFLAGS+=-c -nologo -W3 -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE)
		178	.IF "$(ENABLE_SYMBOLS)" == "yes"
		179	CFLAGS+=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB
		180	.ENDIF # "$(ENABLE_SYMBOLS)" == "yes"
178	.IF "$(bndchk)" == ""	181	.IF "$(bndchk)" == ""
179	CFLAGS+= -Ob1	182	CFLAGS+= -Ob1
180	.ENDIF	183	.ENDIF

Return to issue 12442

Lines 22-34 Link Here

(-)config_office/configure.in (-5 / +7 lines)
22	AC_ARG_ENABLE(symbols,	22	AC_ARG_ENABLE(symbols,
23	[ --enable-symbols Include debugging symbols in output. Warning -	23	[ --enable-symbols Include debugging symbols in output. Warning -
24	a complete build needs 8 Gb of space and takes	24	a complete build needs 8 Gb of space and takes
25	much longer. (enables -g compiler flag)	25	much longer. (enables -g compiler flag for gcc,
		26	-Zi for MSVC)
26		27
27	],,)	28	],,)
28	AC_ARG_ENABLE(debug,	29	AC_ARG_ENABLE(debug,
29	[ --enable-debug: Include debugging symbols from --enable-symbols	30	[ --enable-debug: Include debugging symbols from --enable-symbols
30	plus extra debugging code. Extra large build!	31	plus extra debugging code. Extra large build!
31	(enables -g compiler flag and dmake debug=true)	32	(enables -g compiler flag for gcc, -Zi for MSVC
		33	and dmake debug=true)
32	],,)	34	],,)
33	AC_ARG_WITH(stlport4-home,	35	AC_ARG_WITH(stlport4-home,
34	[ --with-stlport4-home The location that STLport4 is installed in. The STL	36	[ --with-stlport4-home The location that STLport4 is installed in. The STL
Lines 236-244 Link Here
236	dnl First setting is whether to include symbols into final build.	238	dnl First setting is whether to include symbols into final build.
237	dnl ===================================================================	239	dnl ===================================================================
238	if test "$enable_symbols" = "yes"; then	240	if test "$enable_symbols" = "yes"; then
239	ENVCFLAGSCXX="-g"	241	ENABLE_SYMBOLS="yes"
240	else	242	else
241	ENVCFLAGSCXX=""	243	ENABLE_SYMBOLS="no"
242	fi	244	fi
243		245
244	dnl ===================================================================	246	dnl ===================================================================
Lines 1249-1255 Link Here
1249	AC_SUBST(PTHREAD_CFLAGS)	1251	AC_SUBST(PTHREAD_CFLAGS)
1250	AC_SUBST(PTHREAD_LIBS)	1252	AC_SUBST(PTHREAD_LIBS)
1251	AC_SUBST(ENABLE_DEBUG)	1253	AC_SUBST(ENABLE_DEBUG)
1252	AC_SUBST(ENVCFLAGSCXX)	1254	AC_SUBST(ENABLE_SYMBOLS)
1253		1255
1254	AC_OUTPUT([set_soenv])	1256	AC_OUTPUT([set_soenv])
1255		1257

Lines 1609-1615 Link Here

(-)config_office/set_soenv.in (-1 / +10 lines)
1609	if ( $COM ne "MSC" ) {	1609	if ( $COM ne "MSC" ) {
1610	ToFile( "LINK", $CC, "e" );	1610	ToFile( "LINK", $CC, "e" );
1611	}	1611	}
1612	ToFile( "ENVCFLAGSCXX", "@ENVCFLAGSCXX@", "e" );	1612	if ( "@ENABLE_SYMBOLS@" eq "yes" ) {
		1613	if ( "$COM" eq "GCC" ) {
		1614	ToFile( "ENVCFLAGS", "-g", "e" );
		1615	} elsif ( "$COM" eq "MSC" ) {
		1616	# Set the switch(es) in wnt.mk, they are: "-Zi -Fd$(MISC)\$(PDBTARGET).PDB"
		1617	ToFile( "ENABLE_SYMBOLS", "yes", "e" );
		1618	} else {
		1619	die "Don't know how to enable symbols for $COM" ;
		1620	}
		1621	}
1613	ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@","e" );	1622	ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@","e" );
1614	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );	1623	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1615	if ($platform ne "$Winnt")	1624	if ($platform ne "$Winnt")