summaryrefslogtreecommitdiff
path: root/tools/jsonproc
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-08-06 20:16:36 -0400
committerGitHub <noreply@github.com>2019-08-06 20:16:36 -0400
commitca8048c300f7df74e46ade85b1a7f3adbf34522a (patch)
treea76d164bd08fb82a9001e08ecc4d2c18890102c1 /tools/jsonproc
parent2a0517f0fdfe0ce8f2395f6572bf43190ecbe611 (diff)
parente28cf5406b25707338458a3f49125b38750c8627 (diff)
Merge pull request #771 from aaaaaa123456789/master
Fix Makefiles to account for the $CC and $CXX environment variables
Diffstat (limited to 'tools/jsonproc')
-rwxr-xr-xtools/jsonproc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile
index 721da1025..47198b171 100755
--- a/tools/jsonproc/Makefile
+++ b/tools/jsonproc/Makefile
@@ -1,4 +1,4 @@
-CXX := g++
+CXX ?= g++
CXXFLAGS := -Wall -std=c++11 -O2