ocaml-CFLAGS.patch

   1 # allow pass CFLAGS, replace -O, -pg,-DPROFILING with $(CFAGS)
   2 Makefiles=$(find . -type f -name Makefile\*)
   3 %{__sed} -i -e 's@^CFLAGS[ \t]*=@override CFLAGS += @' $Makefiles
   4 %{__sed} -i -e 's@\(^override CFLAGS += .*\)-O \(.*\)@\1\2@' $Makefiles
   5 %{__sed} -i -e 's@^CCFLAGS[ \t]*=\(.*\)@override CCFLAGS += \1 $(CFLAGS)@' $Makefiles
   6 %{__sed} -i -e 's@-pg -O -DPROFILING@ $(CFLAGS) @' asmrun/Makefile
   7 %{__sed} -i -e 's@-O@$(CFLAGS)@' otherlibs/systhreads/Makefile
   8
   9 diff -Nur b.ocaml-3.08.4/asmrun/Makefile n.ocaml-3.08.4/asmrun/Makefile
  10 --- b.ocaml-3.08.4/asmrun/Makefile      2004-05-09 17:19:16.000000000 +0200
  11 +++ n.ocaml-3.08.4/asmrun/Makefile      2005-11-04 21:26:14.810315536 +0100
  12 @@ -18,9 +18,9 @@
  13  CC=$(NATIVECC)
  14  FLAGS=-I../byterun -DCAML_NAME_SPACE -DNATIVE_CODE \
  15        -DTARGET_$(ARCH) -DSYS_$(SYSTEM)
  16 -CFLAGS=$(FLAGS) -O $(NATIVECCCOMPOPTS)
  17 +override CFLAGS += $(FLAGS) $(NATIVECCCOMPOPTS)
  18  DFLAGS=$(FLAGS) -g -DDEBUG $(NATIVECCCOMPOPTS)
  19 -PFLAGS=$(FLAGS) -pg -O -DPROFILING $(NATIVECCPROFOPTS)
  20 +PFLAGS=$(FLAGS)  $(CFLAGS)  $(NATIVECCPROFOPTS)
  21
  22  COBJS=startup.o main.o fail.o roots.o globroots.o signals.o \
  23    misc.o freelist.o major_gc.o minor_gc.o memory.o alloc.o compare.o ints.o \
  24 diff -Nur b.ocaml-3.08.4/asmrun/Makefile.nt n.ocaml-3.08.4/asmrun/Makefile.nt
  25 --- b.ocaml-3.08.4/asmrun/Makefile.nt   2002-06-18 18:17:34.000000000 +0200
  26 +++ n.ocaml-3.08.4/asmrun/Makefile.nt   2005-11-04 21:26:14.407376792 +0100
  27 @@ -16,7 +16,7 @@
  28  include ../config/Makefile
  29
  30  CC=$(NATIVECC)
  31 -CFLAGS=-I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(NATIVECCCOMPOPTS)
  32 +override CFLAGS += -I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(NATIVECCCOMPOPTS)
  33
  34  COBJS=startup.$(O) main.$(O) fail.$(O) roots.$(O) signals.$(O) \
  35    misc.$(O) freelist.$(O) major_gc.$(O) minor_gc.$(O) memory.$(O) alloc.$(O) \
  36 diff -Nur b.ocaml-3.08.4/byterun/Makefile n.ocaml-3.08.4/byterun/Makefile
  37 --- b.ocaml-3.08.4/byterun/Makefile     2004-08-20 17:11:36.000000000 +0200
  38 +++ n.ocaml-3.08.4/byterun/Makefile     2005-11-04 21:26:14.408376640 +0100
  39 @@ -16,7 +16,7 @@
  40  include ../config/Makefile
  41
  42  CC=$(BYTECC)
  43 -CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS)
  44 +override CFLAGS += -DCAML_NAME_SPACE $(BYTECCCOMPOPTS)
  45  DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS)
  46
  47  OBJS=interp.o misc.o stacks.o fix_code.o startup.o main.o \
  48 diff -Nur b.ocaml-3.08.4/byterun/Makefile.nt n.ocaml-3.08.4/byterun/Makefile.nt
  49 --- b.ocaml-3.08.4/byterun/Makefile.nt  2004-08-20 17:11:36.000000000 +0200
  50 +++ n.ocaml-3.08.4/byterun/Makefile.nt  2005-11-04 21:26:14.410376336 +0100
  51 @@ -16,7 +16,7 @@
  52  include ../config/Makefile
  53
  54  CC=$(BYTECC)
  55 -CFLAGS=-DIN_OCAMLRUN -DOCAML_STDLIB_DIR='"$(LIBDIR)"'
  56 +override CFLAGS += -DIN_OCAMLRUN -DOCAML_STDLIB_DIR='"$(LIBDIR)"'
  57
  58  COMMONOBJS=interp.o misc.o stacks.o fix_code.o startup.o \
  59    fail.o signals.o freelist.o major_gc.o minor_gc.o \
  60 diff -Nur b.ocaml-3.08.4/otherlibs/bigarray/Makefile n.ocaml-3.08.4/otherlibs/bigarray/Makefile
  61 --- b.ocaml-3.08.4/otherlibs/bigarray/Makefile  2002-06-27 13:36:00.000000000 +0200
  62 +++ n.ocaml-3.08.4/otherlibs/bigarray/Makefile  2005-11-04 21:26:14.722328912 +0100
  63 @@ -16,7 +16,7 @@
  64  include ../../config/Makefile
  65
  66  CC=$(BYTECC)
  67 -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
  68 +override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
  69  CAMLC=../../ocamlcomp.sh -I ../unix
  70  CAMLOPT=../../ocamlcompopt.sh -I ../unix
  71  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
  72 diff -Nur b.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt n.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt
  73 --- b.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt       2003-07-08 16:24:07.000000000 +0200
  74 +++ n.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt       2005-11-04 21:26:14.723328760 +0100
  75 @@ -16,7 +16,7 @@
  76  include ../../config/Makefile
  77
  78  CC=$(BYTECC)
  79 -CFLAGS=-I../../byterun -I../win32unix -DIN_OCAML_BIGARRAY
  80 +override CFLAGS += -I../../byterun -I../win32unix -DIN_OCAML_BIGARRAY
  81  CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -I ../win32unix
  82  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -I ../win32unix
  83
  84 diff -Nur b.ocaml-3.08.4/otherlibs/dbm/Makefile n.ocaml-3.08.4/otherlibs/dbm/Makefile
  85 --- b.ocaml-3.08.4/otherlibs/dbm/Makefile       2002-06-27 13:36:01.000000000 +0200
  86 +++ n.ocaml-3.08.4/otherlibs/dbm/Makefile       2005-11-04 21:26:14.724328608 +0100
  87 @@ -24,7 +24,7 @@
  88  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
  89  COMPFLAGS=-warn-error A
  90
  91 -CFLAGS=$(DBM_INCLUDES) -I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
  92 +override CFLAGS += $(DBM_INCLUDES) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
  93  COBJS=cldbm.o
  94
  95  all: libmldbm.a dbm.cmi dbm.cma
  96 diff -Nur b.ocaml-3.08.4/otherlibs/graph/Makefile n.ocaml-3.08.4/otherlibs/graph/Makefile
  97 --- b.ocaml-3.08.4/otherlibs/graph/Makefile     2005-06-22 17:47:33.000000000 +0200
  98 +++ n.ocaml-3.08.4/otherlibs/graph/Makefile     2005-11-04 21:26:14.727328152 +0100
  99 @@ -18,7 +18,7 @@
 100  include ../../config/Makefile
 101
 102  CC=$(BYTECC)
 103 -CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
 104 +override CFLAGS += -I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
 105  CAMLC=../../ocamlcomp.sh
 106  CAMLOPT=../../ocamlcompopt.sh
 107  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
 108 diff -Nur b.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt n.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt
 109 --- b.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt 2005-06-27 09:01:40.000000000 +0200
 110 +++ n.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt 2005-11-04 21:26:14.730327696 +0100
 111 @@ -4,7 +4,7 @@
 112  OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/str -I $(OTHERS)/systhreads
 113  OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing
 114  INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB)
 115 -CCFLAGS=-I../../../byterun $(TK_DEFS)
 116 +override CCFLAGS += -I../../../byterun $(TK_DEFS) $(CFLAGS)
 117
 118  ifeq ($(CCOMPTYPE),cc)
 119  WINDOWS_APP=-cclib "-Wl,--subsystem,windows"
 120 diff -Nur b.ocaml-3.08.4/otherlibs/labltk/support/Makefile n.ocaml-3.08.4/otherlibs/labltk/support/Makefile
 121 --- b.ocaml-3.08.4/otherlibs/labltk/support/Makefile    2002-06-27 13:36:01.000000000 +0200
 122 +++ n.ocaml-3.08.4/otherlibs/labltk/support/Makefile    2005-11-04 21:26:14.772321312 +0100
 123 @@ -11,7 +11,7 @@
 124  COBJS=cltkCaml.o cltkUtf.o cltkEval.o cltkEvent.o cltkFile.o cltkMain.o \
 125        cltkMisc.o cltkTimer.o cltkVar.o cltkWait.o cltkImg.o
 126
 127 -CCFLAGS=-I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS)
 128 +override CCFLAGS += -I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS) $(CFLAGS)
 129
 130  COMPFLAGS=-I $(OTHERS)/unix
 131
 132 diff -Nur b.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt n.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt
 133 --- b.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt 2003-07-10 11:18:02.000000000 +0200
 134 +++ n.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt 2005-11-04 21:26:14.774321008 +0100
 135 @@ -13,7 +13,7 @@
 136  DCOBJS=$(COBJS:.o=.$(DO))
 137  SCOBJS=$(COBJS:.o=.$(SO))
 138
 139 -CCFLAGS=-I../../../byterun -I../../win32unix $(TK_DEFS) -DIN_CAMLTKSUPPORT
 140 +override CCFLAGS += -I../../../byterun -I../../win32unix $(TK_DEFS) -DIN_CAMLTKSUPPORT $(CFLAGS)
 141
 142  COMPFLAGS=-I $(OTHERS)/win32unix
 143
 144 diff -Nur b.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile n.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile
 145 --- b.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile     2004-05-08 18:04:39.000000000 +0200
 146 +++ n.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile     2005-11-04 21:26:14.776320704 +0100
 147 @@ -1,7 +1,7 @@
 148  include ../support/Makefile.common
 149
 150  COMPFLAGS=-I ../../../byterun -I ../support -I ../camltk -I ../../unix
 151 -CCFLAGS=-I../../../byterun -I../support $(TK_DEFS) $(SHAREDCCCOMPOPTS)
 152 +override CCFLAGS += -I../../../byterun -I../support $(TK_DEFS) $(SHAREDCCCOMPOPTS) $(CFLAGS)
 153
 154  all: tkanim.cma libtkanim.a
 155  opt: tkanim.cmxa libtkanim.a
 156 diff -Nur b.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile.nt n.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile.nt
 157 --- b.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile.nt  2002-06-27 13:36:01.000000000 +0200
 158 +++ n.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile.nt  2005-11-04 21:26:14.777320552 +0100
 159 @@ -1,6 +1,6 @@
 160  include ../support/Makefile.common.nt
 161
 162 -CCFLAGS=-I../support -I../../../byterun $(TK_DEFS)
 163 +override CCFLAGS += -I../support -I../../../byterun $(TK_DEFS) $(CFLAGS)
 164
 165  COMPFLAGS=-I $(OTHERS)/win32unix -I ../support -I ../camltk
 166
 167 diff -Nur b.ocaml-3.08.4/otherlibs/num/Makefile n.ocaml-3.08.4/otherlibs/num/Makefile
 168 --- b.ocaml-3.08.4/otherlibs/num/Makefile       2003-10-24 11:17:31.000000000 +0200
 169 +++ n.ocaml-3.08.4/otherlibs/num/Makefile       2005-11-04 21:26:14.778320400 +0100
 170 @@ -19,7 +19,7 @@
 171
 172  # Compilation options
 173  CC=$(BYTECC)
 174 -CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
 175 +override CFLAGS += -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
 176            -DBNG_ARCH_$(BNG_ARCH) -DBNG_ASM_LEVEL=$(BNG_ASM_LEVEL)
 177  CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../boot -w s
 178  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -w s
 179 diff -Nur b.ocaml-3.08.4/otherlibs/num/Makefile.nt n.ocaml-3.08.4/otherlibs/num/Makefile.nt
 180 --- b.ocaml-3.08.4/otherlibs/num/Makefile.nt    2004-11-29 09:50:23.000000000 +0100
 181 +++ n.ocaml-3.08.4/otherlibs/num/Makefile.nt    2005-11-04 21:26:14.779320248 +0100
 182 @@ -19,7 +19,7 @@
 183
 184  # Compilation options
 185  CC=$(BYTECC)
 186 -CFLAGS=-I../../byterun \
 187 +override CFLAGS += -I../../byterun \
 188            -DBNG_ARCH_$(BNG_ARCH) -DBNG_ASM_LEVEL=$(BNG_ASM_LEVEL)
 189  CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../boot -w s
 190  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -w s
 191 diff -Nur b.ocaml-3.08.4/otherlibs/num/test/Makefile n.ocaml-3.08.4/otherlibs/num/test/Makefile
 192 --- b.ocaml-3.08.4/otherlibs/num/test/Makefile  2003-10-24 11:17:46.000000000 +0200
 193 +++ n.ocaml-3.08.4/otherlibs/num/test/Makefile  2005-11-04 21:26:14.781319944 +0100
 194 @@ -18,7 +18,7 @@
 195  CAMLC=../../../boot/ocamlrun ../../../ocamlc -I ../../../stdlib
 196  CAMLOPT=../../../boot/ocamlrun ../../../ocamlopt -I ../../../stdlib
 197  CC=$(BYTECC)
 198 -CFLAGS=-I.. -I../../../byterun $(BYTECCCOMPOPTS)
 199 +override CFLAGS += -I.. -I../../../byterun $(BYTECCCOMPOPTS)
 200
 201  test: test.byt test.opt
 202         if $(SUPPORTS_SHARED_LIBRARIES); then ../../../byterun/ocamlrun -I .. ./test.byt; else ./test.byt; fi
 203 diff -Nur b.ocaml-3.08.4/otherlibs/num/test/Makefile.nt n.ocaml-3.08.4/otherlibs/num/test/Makefile.nt
 204 --- b.ocaml-3.08.4/otherlibs/num/test/Makefile.nt       2004-04-01 15:10:12.000000000 +0200
 205 +++ n.ocaml-3.08.4/otherlibs/num/test/Makefile.nt       2005-11-04 21:26:14.782319792 +0100
 206 @@ -18,7 +18,7 @@
 207  CAMLC=../../../boot/ocamlrun ../../../ocamlc -I ../../../stdlib -I ..
 208  CAMLOPT=../../../boot/ocamlrun ../../../ocamlopt -I ../../../stdlib -I ..
 209  CC=$(BYTECC)
 210 -CFLAGS=-I.. $(BYTECCCOMPOPTS)
 211 +override CFLAGS += -I.. $(BYTECCCOMPOPTS)
 212
 213  test: test.byt test.opt
 214         ../../../byterun/ocamlrun -I .. ./test.byt
 215 diff -Nur b.ocaml-3.08.4/otherlibs/str/Makefile n.ocaml-3.08.4/otherlibs/str/Makefile
 216 --- b.ocaml-3.08.4/otherlibs/str/Makefile       2002-12-09 15:05:18.000000000 +0100
 217 +++ n.ocaml-3.08.4/otherlibs/str/Makefile       2005-11-04 21:26:14.784319488 +0100
 218 @@ -19,7 +19,7 @@
 219
 220  # Compilation options
 221  CC=$(BYTECC)
 222 -CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
 223 +override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
 224  CAMLC=../../ocamlcomp.sh
 225  CAMLOPT=../../ocamlcompopt.sh
 226  COMPFLAGS=-warn-error A
 227 diff -Nur b.ocaml-3.08.4/otherlibs/str/Makefile.nt n.ocaml-3.08.4/otherlibs/str/Makefile.nt
 228 --- b.ocaml-3.08.4/otherlibs/str/Makefile.nt    2002-12-09 15:05:18.000000000 +0100
 229 +++ n.ocaml-3.08.4/otherlibs/str/Makefile.nt    2005-11-04 21:26:14.786319184 +0100
 230 @@ -19,7 +19,7 @@
 231
 232  # Compilation options
 233  CC=$(BYTECC)
 234 -CFLAGS=-I../../byterun
 235 +override CFLAGS += -I../../byterun
 236  CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../boot
 237  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
 238  DCOBJS=strstubs.$(DO)
 239 diff -Nur b.ocaml-3.08.4/otherlibs/systhreads/Makefile n.ocaml-3.08.4/otherlibs/systhreads/Makefile
 240 --- b.ocaml-3.08.4/otherlibs/systhreads/Makefile        2003-08-21 15:52:07.000000000 +0200
 241 +++ n.ocaml-3.08.4/otherlibs/systhreads/Makefile        2005-11-04 21:26:14.815314776 +0100
 242 @@ -35,7 +35,7 @@
 243         $(MKLIB) -o threads $(BYTECODE_C_OBJS)
 244
 245  posix_b.o: posix.c
 246 -       $(BYTECC) -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
 247 +       $(BYTECC) $(CFLAGS) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
 248            -c posix.c
 249         mv posix.o posix_b.o
 250
 251 @@ -45,7 +45,7 @@
 252         $(AR) rc libthreadsnat.a $(NATIVECODE_C_OBJS)
 253
 254  posix_n.o: posix.c
 255 -       $(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
 256 +       $(NATIVECC) $(CFLAGS) -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
 257         mv posix.o posix_n.o
 258
 259  threads.cma: $(THREAD_OBJS)
 260 diff -Nur b.ocaml-3.08.4/otherlibs/threads/Makefile n.ocaml-3.08.4/otherlibs/threads/Makefile
 261 --- b.ocaml-3.08.4/otherlibs/threads/Makefile   2003-07-17 10:38:28.000000000 +0200
 262 +++ n.ocaml-3.08.4/otherlibs/threads/Makefile   2005-11-04 21:26:14.790318576 +0100
 263 @@ -16,7 +16,7 @@
 264  include ../../config/Makefile
 265
 266  CC=$(BYTECC)
 267 -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
 268 +override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
 269  CAMLC=../../ocamlcomp.sh -I ../unix
 270  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
 271  COMPFLAGS=-warn-error A
 272 diff -Nur b.ocaml-3.08.4/otherlibs/unix/Makefile n.ocaml-3.08.4/otherlibs/unix/Makefile
 273 --- b.ocaml-3.08.4/otherlibs/unix/Makefile      2004-04-09 15:25:20.000000000 +0200
 274 +++ n.ocaml-3.08.4/otherlibs/unix/Makefile      2005-11-04 21:26:14.792318272 +0100
 275 @@ -19,7 +19,7 @@
 276
 277  # Compilation options
 278  CC=$(BYTECC)
 279 -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
 280 +override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
 281  CAMLC=../../ocamlcomp.sh
 282  CAMLOPT=../../ocamlcompopt.sh
 283  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
 284 diff -Nur b.ocaml-3.08.4/otherlibs/win32graph/Makefile.nt n.ocaml-3.08.4/otherlibs/win32graph/Makefile.nt
 285 --- b.ocaml-3.08.4/otherlibs/win32graph/Makefile.nt     2004-06-21 17:31:58.000000000 +0200
 286 +++ n.ocaml-3.08.4/otherlibs/win32graph/Makefile.nt     2005-11-04 21:26:14.793318120 +0100
 287 @@ -17,7 +17,7 @@
 288
 289  # Compilation options
 290  CC=$(BYTECC)
 291 -CFLAGS=-I../../byterun
 292 +override CFLAGS += -I../../byterun
 293  CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib
 294  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
 295  COMPFLAGS=-warn-error A
 296 diff -Nur b.ocaml-3.08.4/otherlibs/win32unix/Makefile.nt n.ocaml-3.08.4/otherlibs/win32unix/Makefile.nt
 297 --- b.ocaml-3.08.4/otherlibs/win32unix/Makefile.nt      2004-05-30 10:17:06.000000000 +0200
 298 +++ n.ocaml-3.08.4/otherlibs/win32unix/Makefile.nt      2005-11-04 21:26:14.794317968 +0100
 299 @@ -17,7 +17,7 @@
 300
 301  # Compilation options
 302  CC=$(BYTECC)
 303 -CFLAGS=-I../../byterun -I../unix
 304 +override CFLAGS += -I../../byterun -I../unix
 305  CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib
 306  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
 307  COMPFLAGS=-warn-error A
 308 diff -Nur b.ocaml-3.08.4/win32caml/Makefile n.ocaml-3.08.4/win32caml/Makefile
 309 --- b.ocaml-3.08.4/win32caml/Makefile   2004-06-17 09:33:44.000000000 +0200
 310 +++ n.ocaml-3.08.4/win32caml/Makefile   2005-11-04 21:26:14.803316600 +0100
 311 @@ -16,7 +16,7 @@
 312  include ../config/Makefile
 313
 314  CC=$(BYTECC)
 315 -CFLAGS=$(BYTECCCOMPOPTS)
 316 +override CFLAGS += $(BYTECCCOMPOPTS)
 317
 318  OBJS=startocaml.$(O) ocamlres.$(O) ocaml.$(O) menu.$(O) \
 319    history.$(O) editbuffer.$(O)
 320 diff -Nur b.ocaml-3.08.4/yacc/Makefile n.ocaml-3.08.4/yacc/Makefile
 321 --- b.ocaml-3.08.4/yacc/Makefile        2000-08-10 11:58:08.000000000 +0200
 322 +++ n.ocaml-3.08.4/yacc/Makefile        2005-11-04 21:26:14.803316600 +0100
 323 @@ -17,7 +17,7 @@
 324  include ../config/Makefile
 325
 326  CC=$(BYTECC)
 327 -CFLAGS=-O -DNDEBUG $(BYTECCCOMPOPTS)
 328 +override CFLAGS += -DNDEBUG $(BYTECCCOMPOPTS)
 329
 330  OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \
 331    skeleton.o symtab.o verbose.o warshall.o