aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mjit.c5
-rw-r--r--mjit_worker.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/mjit.c b/mjit.c
index 1f9140b7a8..7e3302224c 100644
--- a/mjit.c
+++ b/mjit.c
@@ -632,15 +632,14 @@ mjit_init(struct mjit_options *opts)
if (mjit_opts.max_cache_size < MIN_CACHE_SIZE)
mjit_opts.max_cache_size = MIN_CACHE_SIZE;
- verbose(2, "MJIT: CC defaults to %s", CC_PATH);
-
/* Initialize variables for compilation */
#ifdef _MSC_VER
pch_status = PCH_SUCCESS; /* has prebuilt precompiled header */
#else
pch_status = PCH_NOT_READY;
#endif
- cc_path = CC_PATH;
+ cc_path = CC_COMMON_ARGS[0];
+ verbose(2, "MJIT: CC defaults to %s", cc_path);
tmp_dir = system_tmpdir();
verbose(2, "MJIT: tmp_dir is %s", tmp_dir);
diff --git a/mjit_worker.c b/mjit_worker.c
index 90aaf9d9a9..c09268f3e3 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -249,10 +249,6 @@ static const char *const CC_COMMON_ARGS[] = {
NULL
};
-/* GCC and CLANG executable paths. TODO: The paths should absolute
- ones to prevent changing C compiler for security reasons. */
-#define CC_PATH CC_COMMON_ARGS[0]
-
static const char *const CC_DEBUG_ARGS[] = {MJIT_DEBUGFLAGS NULL};
static const char *const CC_OPTIMIZE_ARGS[] = {MJIT_OPTFLAGS NULL};