summaryrefslogtreecommitdiff
path: root/yacc
diff options
context:
space:
mode:
authorSébastien Hinderer <Sebastien.Hinderer@inria.fr>2018-06-20 13:39:09 +0200
committerSébastien Hinderer <Sebastien.Hinderer@inria.fr>2018-06-20 14:01:42 +0200
commit85fa27f7e97351afe62555793a3824a21b0cc601 (patch)
tree1a54d23b179b6e1598bf116e409fa31106eeef4f /yacc
parenta10a3f58064cf25ef9b16fc9203b3bd242d8bba1 (diff)
downloadocaml-85fa27f7e97351afe62555793a3824a21b0cc601.tar.gz
Rename C compiler related build variables
This commit renames a few C compiler related build variables so that they are reserved for the build system. They will then be re-introduced, but this time as user varialbes whose value can be freely customized when compiling the package, without risking to conflict with those command-line flags that are required by the build system itself. Here are the variables this commit renames: - CFLAGS -> OC_CFLAGS - CPPFLAGS -> OC_CPPFLAGS - LDFLAGS -> OC_LDFLAGS Note: before this commit the compilation of scheduler.c in otherlibs/threads was relying on make's implicit rule to compile C files. Since this commit stops using the standard variables for flags, it is necessary to introduce an explicit rule to compile C files and that makes use of the newly introduced variables.
Diffstat (limited to 'yacc')
-rw-r--r--yacc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/yacc/Makefile b/yacc/Makefile
index 8d3b0870c9..7555b603bc 100644
--- a/yacc/Makefile
+++ b/yacc/Makefile
@@ -55,4 +55,4 @@ warshall.$(O): defs.h
# also works for .obj files.
%.$(O): %.c
- $(CC) -c $(CFLAGS) $(CPPFLAGS) -I../byterun $(OUTPUTOBJ)$@ $<
+ $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) -I../byterun $(OUTPUTOBJ)$@ $<