Skip to content

Commit 6bca34a

Browse files
jvillardfacebook-github-bot
authored andcommitted
[build] remove unused ocamlopt-custom-cc
Summary: Not sure when this became dead but it doesn't even work since nothing makes use of `extra_cflags`. Reviewed By: dulmarod Differential Revision: D71981207 Privacy Context Container: L1208441 fbshipit-source-id: 6af5799c76b0838f4bc67a9ae0aeecdeb01eb690
1 parent 5ceab52 commit 6bca34a

File tree

4 files changed

+0
-16
lines changed

4 files changed

+0
-16
lines changed

Makefile.autoconf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ CXXFLAGS := @CXXFLAGS@
3131
# this is useless but autoconf is picky...
3232
datarootdir = @datarootdir@
3333
EMACS := @EMACS@
34-
ENABLE_OCAMLOPT_CUSTOM_CC := @ENABLE_OCAMLOPT_CUSTOM_CC@
3534
ENABLE_OCAML_BINANNOT := @ENABLE_OCAML_BINANNOT@
3635
ERLC := @ERLC@
3736
ESCRIPT := @ESCRIPT@

configure.ac

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,6 @@ AS_IF([test "x$enable_c_analyzers" = "xyes"], [
189189
# cmake is required to build llvm+clang
190190
AC_CHECK_TOOL([CMAKE], [cmake], [no])
191191
AC_ASSERT_PROG([cmake], [$CMAKE])
192-
AC_ARG_ENABLE(ocamlopt-custom-cc,
193-
AS_HELP_STRING([--enable-ocamlopt-custom-cc], [use CC in ocamlopt invocations]),
194-
,
195-
enable_ocamlopt_custom_cc=no)
196-
ENABLE_OCAMLOPT_CUSTOM_CC=$enable_ocamlopt_custom_cc
197-
AC_SUBST([ENABLE_OCAMLOPT_CUSTOM_CC])
198192
])
199193
# end if($enable_c_analyzers)
200194

infer/src/Makefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,7 @@ FCP_CLANG_AST_PROJ = $(addprefix $(FCP_CLANG_OCAML_BUILD_DIR)/, \
3131
FCP_CLANG_AST_MAIN = $(addprefix $(FCP_CLANG_OCAML_DIR)/, clang_ast_visit.ml clang_ast_types.ml)
3232
FCP_FILES_TO_MIRROR = $(FCP_CLANG_AST_PROJ) $(FCP_CLANG_AST_MAIN)
3333
CLANG_PLUGIN_MIRRORED_FILES = $(addprefix $(CLANG_PLUGIN_MIRROR)/, $(notdir $(FCP_FILES_TO_MIRROR)))
34-
3534
CLANG_BINIOU_DICT = $(ETC_DIR)/clang_ast.dict
36-
37-
ifeq ($(ENABLE_OCAMLOPT_CUSTOM_CC),yes)
38-
EXTRA_CFLAGS += -cc,$(CC)
39-
endif
40-
4135
OCAML_GENERATED_SOURCES = base/Version.ml
4236

4337
ifeq ($(BUILD_C_ANALYZERS),yes)
@@ -240,7 +234,6 @@ $(GENERATED_FROM_AUTOCONF): $(MAKEFILE_LIST)
240234
INFER_GIT_COMMIT=$$(git --work-tree=$(ROOT_DIR) --git-dir=$(ROOT_DIR)/.git rev-parse --short HEAD || printf "unknown"); \
241235
INFER_GIT_BRANCH=$$(git --work-tree=$(ROOT_DIR) --git-dir=$(ROOT_DIR)/.git rev-parse --abbrev-ref HEAD || printf "unknown"); \
242236
sed \
243-
-e 's|@EXTRA_CFLAGS[@]|$(EXTRA_CFLAGS)|g' \
244237
-e 's|@INFER_MAJOR[@]|$(INFER_MAJOR)|g' \
245238
-e 's|@INFER_MINOR[@]|$(INFER_MINOR)|g' \
246239
-e 's|@INFER_PATCH[@]|$(INFER_PATCH)|g' \

infer/src/dune.common.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ let swift = is_yes "@BUILD_SWIFT_ANALYZERS@"
2525

2626
let facebook = is_yes "@IS_FACEBOOK_TREE@"
2727

28-
let extra_cflags = if is_empty "@EXTRA_CFLAGS@" then [] else ["@EXTRA_CFLAGS@"]
29-
3028
let windows = is_yes "@WINDOWS_BUILD@"
3129

3230
let darwin = String.equal "@BUILD_PLATFORM@" "Darwin"

0 commit comments

Comments
 (0)