diff options
author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-03 12:00:27 +0000 |
---|---|---|
committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-03 12:00:27 +0000 |
commit | 33eebfd30132304244f35407daec37c4ba77a870 (patch) | |
tree | 6822fabe9ad3fda6ed60a1730df92ebfbd89aeb6 | |
parent | a8812080c4977c2731e8ff1b129b59d236bc12e3 (diff) | |
download | ruby-33eebfd30132304244f35407daec37c4ba77a870.tar.gz |
mjit_worker.c: undefine CC_PATH
because we mostly use cc_path now and the comment is obsolete (CC_PATH
is now absolute path and the TODO is already resolved).
mjit.c: use CC_COMMON_ARGS[0] directly
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | mjit.c | 5 | ||||
-rw-r--r-- | mjit_worker.c | 4 |
2 files changed, 2 insertions, 7 deletions
@@ -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}; |