Skip to content

Commit

Permalink
[build] save the value of PLUGIN_SETUP_SCRIPT from ./configure
Browse files Browse the repository at this point in the history
Summary:
This avoids the need for setting `PLUGIN_SETUP_SCRIPT` for every `make`
command, or `export`ing it.

Reviewed By: ngorogiannis

Differential Revision: D62244878

fbshipit-source-id: ea514cf841b3a1d27d0181d05751200338592fdf
  • Loading branch information
jvillard authored and facebook-github-bot committed Sep 5, 2024
1 parent 6905928 commit 774c656
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,6 @@ byte_infer: byte
opt:
$(QUIET)$(MAKE) BUILD_MODE=opt infer

PLUGIN_SETUP_SCRIPT ?= setup.sh

.PHONY: clang_setup
clang_setup:
# if clang is already built then let the user know they might not need to rebuild clang
Expand Down
1 change: 1 addition & 0 deletions Makefile.autoconf.in
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ OTOOL := @OTOOL@
PATCHELF := @PATCHELF@
PATH := @PATH@
PLATFORM_ENV := @PLATFORM_ENV@
PLUGIN_SETUP_SCRIPT := @PLUGIN_SETUP_SCRIPT@
prefix := @prefix@
PYTHON := @PYTHON@
PYTHONHOME := @PYTHONHOME@
Expand Down
5 changes: 5 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ AC_SUBST([REALPATH])

AC_ARG_VAR([PLATFORM_ENV], [Build and link binaries against this platform rather than system default (Linux only)])

AC_MSG_CHECKING([for the name of the plugin setup script])
AC_ARG_VAR([PLUGIN_SETUP_SCRIPT], [name of the setup script for building clang (default: setup.sh)])
AS_IF([test x"$PLUGIN_SETUP_SCRIPT" = x], [PLUGIN_SETUP_SCRIPT=setup.sh])
AC_MSG_RESULT([$PLUGIN_SETUP_SCRIPT])

AC_ARG_ENABLE(c-analyzers,
AS_HELP_STRING([--disable-c-analyzers],
[do not build the C/C++/ObjC analyzers (default is to build them)]),
Expand Down

0 comments on commit 774c656

Please sign in to comment.