| @@ -0,0 +1,111 @@
+--- asmrun/Makefile
++++ asmrun/Makefile
+@@ -18,9 +18,9 @@
+ CC=$(NATIVECC)
+ FLAGS=-I../byterun -DCAML_NAME_SPACE -DNATIVE_CODE \
+ -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(IFLEXDIR)
+-CFLAGS=$(FLAGS) -O $(NATIVECCCOMPOPTS)
++CFLAGS=$(FLAGS) $(RPM_OPT_FLAGS) -O $(NATIVECCCOMPOPTS)
+ DFLAGS=$(FLAGS) -g -DDEBUG $(NATIVECCCOMPOPTS)
+-PFLAGS=$(FLAGS) -pg -O -DPROFILING $(NATIVECCPROFOPTS)
++PFLAGS=$(FLAGS) $(RPM_OPT_FLAGS) -pg -O -DPROFILING $(NATIVECCPROFOPTS)
+
+ COBJS=startup.o main.o fail.o roots.o globroots.o signals.o signals_asm.o \
+ misc.o freelist.o major_gc.o minor_gc.o memory.o alloc.o compare.o ints.o \
+--- byterun/Makefile
++++ byterun/Makefile
+@@ -15,7 +15,7 @@
+
+ include Makefile.common
+
+-CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR)
++CFLAGS=-DCAML_NAME_SPACE $(RPM_OPT_FLAGS) -O $(BYTECCCOMPOPTS) $(IFLEXDIR)
+ DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS)
+
+ OBJS=$(COMMONOBJS) unix.o main.o
+--- configure
++++ configure
+@@ -322,7 +322,7 @@
+
+ # Configure compiler to use in further tests
+
+-cc="$bytecc -O $bytecclinkopts"
++cc="$bytecc $RPM_OPT_FLAGS $bytecclinkopts"
+ export cc cclibs verbose
+
+ # Check C compiler
+--- otherlibs/Makefile
++++ otherlibs/Makefile
+@@ -17,7 +17,7 @@
+
+ CAMLC=$(ROOTDIR)/ocamlcomp.sh
+ CAMLOPT=$(ROOTDIR)/ocamlcompopt.sh
+-CFLAGS=-I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
++CFLAGS=$(RPM_OPT_FLAGS) -I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
+
+ include ../Makefile.shared
+ # Note .. is the current directory (this makefile is included from
+--- otherlibs/labltk/support/Makefile
++++ otherlibs/labltk/support/Makefile
+@@ -12,7 +12,7 @@
+ cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \
+ cltkVar.$(O) cltkWait.$(O) cltkImg.$(O)
+
+-CCFLAGS=-I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS)
++CCFLAGS=$(RPM_OPT_FLAGS) -I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS)
+
+ COMPFLAGS=-I $(OTHERS)/win32unix -I $(OTHERS)/unix
+ THFLAGS=-I $(OTHERS)/systhreads -I $(OTHERS)/threads
+--- otherlibs/labltk/tkanim/Makefile
++++ otherlibs/labltk/tkanim/Makefile
+@@ -4,7 +4,7 @@
+ include ../support/Makefile.common
+
+ COMPFLAGS=-I ../support -I ../camltk -I ../../unix -I ../../win32unix
+-CCFLAGS=-I../../../byterun -I../support $(TK_DEFS) $(SHAREDCCCOMPOPTS)
++CCFLAGS=$(RPM_OPT_FLAGS) -I../../../byterun -I../support $(TK_DEFS) $(SHAREDCCCOMPOPTS)
+
+ all: tkanim.cma libtkanim.$(A)
+ opt: tkanim.cmxa libtkanim.$(A)
+--- otherlibs/systhreads/Makefile
++++ otherlibs/systhreads/Makefile
+@@ -35,7 +35,7 @@
+ $(MKLIB) -o threads $(BYTECODE_C_OBJS)
+
+ posix_b.o: posix.c
+- $(BYTECC) -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
++ $(BYTECC) $(RPM_OPT_FLAGS) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
+ -c posix.c
+ mv posix.o posix_b.o
+
+@@ -45,7 +45,7 @@
+ $(AR) rc libthreadsnat.a $(NATIVECODE_C_OBJS)
+
+ posix_n.o: posix.c
+- $(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
++ $(NATIVECC) $(RPM_OPT_FLAGS) -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
+ mv posix.o posix_n.o
+
+ threads.cma: $(THREAD_OBJS)
+--- otherlibs/threads/Makefile
++++ otherlibs/threads/Makefile
+@@ -16,7 +16,7 @@
+ include ../../config/Makefile
+
+ CC=$(BYTECC)
+-CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
++CFLAGS=-I../../byterun $(RPM_OPT_FLAGS) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
+ CAMLC=../../ocamlcomp.sh -I ../unix
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+ COMPFLAGS=-warn-error A
+--- yacc/Makefile
++++ yacc/Makefile
+@@ -17,7 +17,7 @@
+ include ../config/Makefile
+
+ CC=$(BYTECC)
+-CFLAGS=-O -DNDEBUG $(BYTECCCOMPOPTS)
++CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG $(BYTECCCOMPOPTS)
+
+ OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \
+ skeleton.o symtab.o verbose.o warshall.o
|
