Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ocaml/utils/Makefile

118 lines
4.2 KiB
Makefile
Raw Normal View History

Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
#**************************************************************************
#* *
#* OCaml *
#* *
#* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
#* *
#* Copyright 1999 Institut National de Recherche en Informatique et *
#* en Automatique. *
#* *
#* All rights reserved. This file is distributed under the terms of *
#* the GNU Lesser General Public License version 2.1, with the *
#* special exception on linking described in the file LICENSE. *
#* *
#**************************************************************************
# The Makefile for generating the configuration file
ROOTDIR = ..
Share generation code between ocamltest and utils ocamltest/ocamltest_config.ml now generated using same make macros as utils/config.ml.
2020-02-05 09:29:43 -08:00
include $(ROOTDIR)/Makefile.common
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
Move FLEXDLL_DIR definition to utils/Makefile (#2259) Missed in d68e0e207. Fixes second part of MPR#7923.
2019-02-28 02:21:52 -08:00
ifeq "$(UNIX_OR_WIN32)" "win32"
ifeq "$(wildcard $(ROOTDIR)/flexdll/Makefile)" ""
FLEXDLL_DIR =
else
FLEXDLL_DIR = $(if $(wildcard $(ROOTDIR)/flexdll/flexdll_*.$(O)),+flexdll)
endif
else
FLEXDLL_DIR =
endif
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
FLEXLINK_FLAGS ?=
Share generation code between ocamltest and utils ocamltest/ocamltest_config.ml now generated using same make macros as utils/config.ml.
2020-02-05 09:29:43 -08:00
# SUBST_QUOTE does the same as SUBST_STRING, adding OCaml quotes around
# non-empty strings (see FLEXDLL_DIR which must empty if FLEXDLL_DIR is empty
# but an OCaml string otherwise)
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
SUBST_QUOTE2=\
-e 's!%%$1%%!$(if $2,$(call SED_ESCAPE,"$(call OCAML_ESCAPE,$2)"))!'
SUBST_QUOTE=$(call SUBST_QUOTE2,$1,$($1))
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
FLEXLINK_LDFLAGS=$(if $(OC_LDFLAGS), -link "$(OC_LDFLAGS)")
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
correctly register dependencies
2018-10-11 07:17:19 -07:00
config.ml: config.mlp $(ROOTDIR)/Makefile.config Makefile
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
sed $(call SUBST,AFL_INSTRUMENT) \
$(call SUBST,ARCH) \
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
$(call SUBST_STRING,ARCMD) \
$(call SUBST_STRING,ASM) \
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
$(call SUBST,ASM_CFI_SUPPORTED) \
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
$(call SUBST_STRING,BYTECCLIBS) \
$(call SUBST_STRING,CC) \
$(call SUBST_STRING,CCOMPTYPE) \
$(call SUBST_STRING,OUTPUTOBJ) \
$(call SUBST_STRING,EXT_ASM) \
$(call SUBST_STRING,EXT_DLL) \
$(call SUBST_STRING,EXE) \
$(call SUBST_STRING,EXT_LIB) \
$(call SUBST_STRING,EXT_OBJ) \
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
$(call SUBST,FLAMBDA) \
$(call SUBST,WITH_FLAMBDA_INVARIANTS) \
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
$(call SUBST_STRING,FLEXLINK_FLAGS) \
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
$(call SUBST_QUOTE,FLEXDLL_DIR) \
$(call SUBST,HOST) \
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
$(call SUBST_STRING,LIBDIR) \
$(call SUBST_STRING,MKDLL) \
$(call SUBST_STRING,MKEXE) \
$(call SUBST_STRING,FLEXLINK_LDFLAGS) \
$(call SUBST_STRING,MKMAINDLL) \
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
$(call SUBST,MODEL) \
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
$(call SUBST_STRING,NATIVECCLIBS) \
$(call SUBST_STRING,OCAMLC_CFLAGS) \
$(call SUBST_STRING,OCAMLC_CPPFLAGS) \
$(call SUBST_STRING,OCAMLOPT_CFLAGS) \
$(call SUBST_STRING,OCAMLOPT_CPPFLAGS) \
$(call SUBST_STRING,PACKLD) \
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
$(call SUBST,PROFINFO_WIDTH) \
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
$(call SUBST_STRING,RANLIBCMD) \
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
$(call SUBST,FORCE_SAFE_STRING) \
$(call SUBST,DEFAULT_SAFE_STRING) \
$(call SUBST,WINDOWS_UNICODE) \
$(call SUBST,SUPPORTS_SHARED_LIBRARIES) \
$(call SUBST,SYSTEM) \
$(call SUBST,SYSTHREAD_SUPPORT) \
$(call SUBST,TARGET) \
$(call SUBST,WITH_FRAME_POINTERS) \
$(call SUBST,WITH_PROFINFO) \
$(call SUBST,FLAT_FLOAT_ARRAY) \
Emit each function in a separate section (amd64,i386,arm,arm64) Add --enable-function-sections option to configure. With this option, the compiler will emit each function in a separate named text section, on supported targets. This enables function reordering using a linker script. With this option, the compiler also emits caml_hot__code_begin and caml_hot__code_end sections. This allows a linker script to move function sections outside of the segments they belong to, without breaking caml_code_segments.
2019-02-20 10:46:43 -08:00
$(call SUBST,FUNCTION_SECTIONS) \
Provide a way to build the bytecode compiler using Dune (#2093)
2018-10-10 08:16:00 -07:00
$(call SUBST,CC_HAS_DEBUG_PREFIX_MAP) \
$(call SUBST,AS_HAS_DEBUG_PREFIX_MAP) \
$< > $@
Improve quoting of parameters that are inserted in utils/config.ml There were some issues in the way parameters from Makefile.config are inserted in utils/config.mlp to produce utils/config.ml: - Some of the make functions involved used parameter "$2" yet were called with only one argument, causing a warning by "make --warn-undefined-variables". - Despite heroic attempts, special characters in the parameters were not always quoted or quoted enough. For example, if FLEXDLL_DIR is C:\foo, the generated utils/config.ml contains "C:\foo", which is not a valid OCaml string literal. This commit fixes these issues by: - Revising and commenting the make functions that produce the properly-quoted sed substitution commands. - Adding an extra round of quoting for variables used inside OCaml's string literals "..." (function SUBST_STRING) - Adding two round-trip tests (make test-subst, make test-subst-string) to make sure that all printable characters are properly quoted.
2019-04-28 01:19:15 -07:00
# Test for the substitution functions above
ALLCHARS= \
!"\#\$\%&'()*+,-./ \
0123456789:;<=>? \
@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ \
`abcdefghijklmnopqrstuvwxyz{|}~
TMPFILE=testdata.tmp
TMPSCRIPT=ocamlscript.tmp
test-subst:
$(file >$(TMPFILE),$(ALLCHARS))
echo '%%ALLCHARS%%' | sed $(call SUBST,ALLCHARS) | cmp $(TMPFILE) -
@rm $(TMPFILE)
@echo "Test passed"
# This test assumes there is a working OCaml in the path
test-subst-string:
$(file >$(TMPFILE),$(ALLCHARS))
echo 'print_string "%%ALLCHARS%%"; print_newline();;' \
| sed $(call SUBST_STRING,ALLCHARS) > $(TMPSCRIPT) && \
ocaml $(TMPSCRIPT) | cmp $(TMPFILE) -
@rm $(TMPFILE) $(TMPSCRIPT)
@echo "Test passed"