You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.7 KiB
43 lines
1.7 KiB
--- a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100
|
|
+++ b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100
|
|
@@ -335,7 +335,7 @@
|
|
# (without the extension, which is added by the macro)
|
|
define COMPILE_C_FILE
|
|
$(1).$(O): %.c
|
|
- $$(CC) -c $$(OC_CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
|
|
+ $$(CC) -c $$(OC_CFLAGS) $(CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
|
|
endef
|
|
|
|
object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic
|
|
--- a/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:15.316779625 +0100
|
|
+++ b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701 +0100
|
|
@@ -138,4 +138,4 @@
|
|
$(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $<
|
|
|
|
.c.$(O):
|
|
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
|
|
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
|
|
--- a/otherlibs/systhreads/Makefile 2022-01-22 20:42:17.647349876 +0100
|
|
+++ b/otherlibs/systhreads/Makefile 2022-01-22 20:43:29.766086103 +0100
|
|
@@ -102,10 +102,10 @@
|
|
st_stubs_n.$(O): OC_CPPFLAGS += $(NATIVE_CPPFLAGS)
|
|
|
|
st_stubs_b.$(O): st_stubs.c $(HEADER)
|
|
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
|
|
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
|
|
|
|
st_stubs_n.$(O): st_stubs.c $(HEADER)
|
|
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
|
|
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
|
|
|
|
partialclean:
|
|
rm -f *.cm*
|
|
--- a/Makefile.common.in 2022-01-23 18:05:04.192323554 +0100
|
|
+++ b/Makefile.common.in 2022-01-23 18:05:17.211122643 +0100
|
|
@@ -79,4 +79,4 @@
|
|
# general (it supports both .o and .obj)
|
|
|
|
%.$(O): %.c
|
|
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
|
|
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
|