Index: settings.mk =================================================================== RCS file: /cvs/tools/solenv/inc/settings.mk,v retrieving revision 1.128.2.5 diff -u -b -B -p -r1.128.2.5 settings.mk --- settings.mk 17 Mar 2003 16:17:01 -0000 1.128.2.5 +++ settings.mk 28 Mar 2003 11:30:46 -0000 @@ -427,13 +427,13 @@ use_shl_versions*=$(USE_SHL_VERSIONS) # --- env flags not case sensitive -------------------------------- -.IF "$(envcflags)"!="" +#.IF "$(envcflags)"!="" ENVCFLAGS*=$(envcflags) -.ENDIF +#.ENDIF -.IF "$(envcflagscxx)"!="" +#.IF "$(envcflagscxx)"!="" ENVCFLAGSCXX*=$(envcflagscxx) -.ENDIF +#.ENDIF .IF "$(envcdefs)"!="" Index: unxlngi3.mk =================================================================== RCS file: /cvs/tools/solenv/inc/unxlngi3.mk,v retrieving revision 1.18.6.1.34.1 diff -u -b -B -p -r1.18.6.1.34.1 unxlngi3.mk --- unxlngi3.mk 27 Mar 2003 11:37:04 -0000 1.18.6.1.34.1 +++ unxlngi3.mk 28 Mar 2003 11:30:46 -0000 @@ -133,7 +133,7 @@ STATIC = -Wl,-Bstatic DYNAMIC = -Wl,-Bdynamic # name of linker -LINK=gcc +LINK*=gcc # default linker flags LINKFLAGS= Index: unxlngi4.mk =================================================================== RCS file: /cvs/tools/solenv/inc/unxlngi4.mk,v retrieving revision 1.12.12.4.20.1 diff -u -b -B -p -r1.12.12.4.20.1 unxlngi4.mk --- unxlngi4.mk 27 Mar 2003 11:37:05 -0000 1.12.12.4.20.1 +++ unxlngi4.mk 28 Mar 2003 11:30:46 -0000 @@ -89,12 +89,7 @@ CXX*=g++ # name of C Compiler CC*=gcc # flags for C and C++ Compiler -# do not use standard header search paths -# if installed elsewhere -.IF "$(BUILD_SOSL)"!="" -CFLAGS= -.ENDIF -CFLAGS+=-fmessage-length=0 -c $(INCLUDE) -g +CFLAGS+=-fmessage-length=0 -c $(INCLUDE) # flags for the C++ Compiler CFLAGSCC= -pipe -mcpu=pentiumpro # Flags for enabling exception handling