diff options
| author | Rickard Green <[email protected]> | 2010-02-08 14:04:16 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-08 15:54:01 +0100 |
| commit | a4e2377c72f2e6f018792dff10ed967f08cfac5f (patch) | |
| tree | 2d5e2debd474214220c59a7596934ee26ed64e07 /erts/emulator/zlib | |
| parent | 2db75179169db7ae0126f4d12d6f8a16fded84eb (diff) | |
| download | otp-a4e2377c72f2e6f018792dff10ed967f08cfac5f.tar.gz otp-a4e2377c72f2e6f018792dff10ed967f08cfac5f.tar.bz2 otp-a4e2377c72f2e6f018792dff10ed967f08cfac5f.zip | |
OTP-8412 Fixed numerous compiler warnings generated by gcc 4.4.1 and
tile-cc 2.0.1.78377 when compiling the runtime system.
Diffstat (limited to 'erts/emulator/zlib')
| -rw-r--r-- | erts/emulator/zlib/Makefile.in | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/erts/emulator/zlib/Makefile.in b/erts/emulator/zlib/Makefile.in index 5c99b460c1..b44a87551d 100644 --- a/erts/emulator/zlib/Makefile.in +++ b/erts/emulator/zlib/Makefile.in @@ -14,12 +14,7 @@ # make install prefix=$HOME ARFLAGS = rc -ifeq ($(findstring ose,$(TARGET)),ose) - TYPE_FLAGS = -else - TYPE_FLAGS = -O3 -endif -CFLAGS = @CFLAGS@ @DEFS@ @EMU_THR_DEFS@ $(TYPE_FLAGS) +CFLAGS = $(subst -O2, -O3, @CFLAGS@ @DEFS@ @EMU_THR_DEFS@) #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ @@ -36,24 +31,15 @@ OBJS = $(O:%=$(OBJDIR)/%) include $(ERL_TOP)/make/target.mk -# On windows we need a separate zlib during debug build -ifeq ($(TARGET),win32) - -ifeq ($(TYPE),debug) -CFLAGS = $(subst -O2, -g, @CFLAGS@ @DEFS@ @DEBUG_FLAGS@) -endif # debug - -else # win32 - ifeq ($(TYPE),gcov) -CFLAGS = $(subst -O2, -g, -O0 -fprofile-arcs -ftest-coverage @CFLAGS@ @DEFS@ @DEBUG_FLAGS@) -TYPE_FLAGS= +CFLAGS = -O0 -fprofile-arcs -ftest-coverage @DEBUG_CFLAGS@ @DEFS@ @EMU_THR_DEFS@ else # gcov -# On other platforms we use no special debug version of zlib +ifeq ($(TYPE),debug) +CFLAGS = @DEBUG_CFLAGS@ @DEFS@ @EMU_THR_DEFS@ +endif # debug endif # gcov -endif # win32 - +# On windows we *need* a separate zlib during debug build OBJDIR= $(ERL_TOP)/erts/emulator/zlib/obj/$(TARGET)/$(TYPE) include $(ERL_TOP)/make/$(TARGET)/otp.mk |