1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mjit_worker.c: undefine CC_PATH

Browse Source 
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
This commit is contained in:
k0kubun 2018-12-03 12:00:27 +00:00
parent a8812080c4
commit 33eebfd301
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mjit.c
View File

@ -632,15 +632,14 @@ mjit_init(struct mjit_options *opts)
if (mjit_opts.max_cache_size < MIN_CACHE_SIZE) if (mjit_opts.max_cache_size < MIN_CACHE_SIZE)
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 */ /* Initialize variables for compilation */
#ifdef _MSC_VER #ifdef _MSC_VER
pch_status = PCH_SUCCESS; /* has prebuilt precompiled header */ pch_status = PCH_SUCCESS; /* has prebuilt precompiled header */
#else #else
pch_status = PCH_NOT_READY; pch_status = PCH_NOT_READY;
#endif #endif
cc_path = CC_PATH; cc_path = CC_COMMON_ARGS[0];
verbose(2, "MJIT: CC defaults to %s", cc_path);
tmp_dir = system_tmpdir(); tmp_dir = system_tmpdir();
verbose(2, "MJIT: tmp_dir is %s", tmp_dir); verbose(2, "MJIT: tmp_dir is %s", tmp_dir);

4
mjit_worker.c
View File

@ -249,10 +249,6 @@ static const char *const CC_COMMON_ARGS[] = {
NULL 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_DEBUG_ARGS[] = {MJIT_DEBUGFLAGS NULL};
static const char *const CC_OPTIMIZE_ARGS[] = {MJIT_OPTFLAGS NULL}; static const char *const CC_OPTIMIZE_ARGS[] = {MJIT_OPTFLAGS NULL};