diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-06 20:16:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 20:16:36 -0400 |
| commit | ca8048c300f7df74e46ade85b1a7f3adbf34522a (patch) | |
| tree | a76d164bd08fb82a9001e08ecc4d2c18890102c1 /tools/mapjson | |
| parent | 2a0517f0fdfe0ce8f2395f6572bf43190ecbe611 (diff) | |
| parent | e28cf5406b25707338458a3f49125b38750c8627 (diff) | |
Merge pull request #771 from aaaaaa123456789/master
Fix Makefiles to account for the $CC and $CXX environment variables
Diffstat (limited to 'tools/mapjson')
| -rw-r--r-- | tools/mapjson/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mapjson/Makefile b/tools/mapjson/Makefile index 9a49be506..c1f703f9f 100644 --- a/tools/mapjson/Makefile +++ b/tools/mapjson/Makefile @@ -1,4 +1,4 @@ -CXX := g++ +CXX ?= g++ CXXFLAGS := -Wall -std=c++11 -O2 |