Skip to content

Commit

Permalink
Merge pull request #3090 from stan-dev/fix/3088-remove-HOME-makefile-…
Browse files Browse the repository at this point in the history
…inclusion

Remove support for ~/.config makefile inclusion
  • Loading branch information
WardBrian authored Jun 26, 2024
2 parents fe521e0 + 4b02ee1 commit af63738
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 13 deletions.
3 changes: 1 addition & 2 deletions doxygen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ export TBB_LIB="$TBB/lib/intel64/gcc4.8"

- Set `Stan` local compiler flags to use the new TBB interface:
```bash
mkdir -p ~/.config/stan
echo TBB_INTERFACE_NEW=true>> ~/.config/stan/make.local
echo TBB_INTERFACE_NEW=true>> ./make/local
```

Compilers
Expand Down
6 changes: 2 additions & 4 deletions doxygen/contributor_help_pages/developer_doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,7 @@ Within the Math library, the only build targets are the tests (there are no othe

## Makefile Variables

To customize how the tests are built in C++, variables can be set in a file called `make/local`. This is the preferred way of customizing the build. You can also set it more permanently by setting variables in `~/.config/stan/make.local`.

Note: variables in `make/local` override variables in `~/.config/stan/make/local`.
To customize how the tests are built in C++, variables can be set in a file called `make/local`. This is the preferred way of customizing the build.

There are a lot of make variables that can be set. In general, `CXXFLAGS_*` is for C++ compiler flags, `CPPFLAGS_*` is for C preprocessor flags, `LDFLAGS_*` is for linker flags, and `LDLBIS_*` is for libraries that need to be linked in.

Expand Down Expand Up @@ -310,7 +308,7 @@ If you want to use custom locations for the library locations, set these makefil
- `GTEST`
- `CPPLINT` (optional)

Example `~/.config/stan/make.local` file:
Example `make/local` file:
```
BOOST = ~/boost
```
Expand Down
1 change: 0 additions & 1 deletion make/standalone
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

MATH_MAKE ?=$(dir $(abspath $(firstword $(MAKEFILE_LIST))))
MATH ?= $(realpath $(MATH_MAKE)..)/
-include $(HOME)/.config/stan/make.local
-include $(MATH)make/local
-include $(MATH)make/compiler_flags
-include $(MATH)make/libraries
Expand Down
7 changes: 1 addition & 6 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@
# Stan Math Library
# -----------------
#
# To customize your build, set make variables in either:
# ~/.config/stan/make.local
# make/local
# Variables in make/local is loaded after ~/.config/stan/make.local

# To customize your build, set make variables in the file make/local.

## 'help' is the default make target.
help:

-include $(HOME)/.config/stan/make.local # user-defined variables
-include make/local # user-defined variables

include make/compiler_flags # CXX, CXXFLAGS, LDFLAGS set by the end of this file
Expand Down

0 comments on commit af63738

Please sign in to comment.