Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the default CPP path a list and check if they are access(2)able.

Browse Source 
If no match is found, fallback to looking for cpp in PATH.
This commit is contained in:
joerg 2016-02-24 21:11:34 +00:00
parent 1674f8e308
commit f247f26769
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c vendored
View File

@ -788,10 +788,10 @@ const dtrace_pattr_t _dtrace_prvdesc = {
};
#ifdef illumos
const char *_dtrace_defcpp = "/usr/ccs/lib/cpp"; /* default cpp(1) to invoke */
const char *_dtrace_defcpps[] = { "/usr/ccs/lib/cpp" }; /* default cpp(1) to invoke */
const char *_dtrace_defld = "/usr/ccs/bin/ld"; /* default ld(1) to invoke */
#else
const char *_dtrace_defcpp = "cpp"; /* default cpp(1) to invoke */
const char *_dtrace_defcpps[] = { "/usr/bin/cpp", "/usr/bin/clang-cpp" }; /* default cpp(1) to invoke */
const char *_dtrace_defld = "ld"; /* default ld(1) to invoke */
const char *_dtrace_defobjcopy = "objcopy"; /* default objcopy(1) to invoke */
#endif
@ -1195,7 +1195,16 @@ alloc:
dtp->dt_provs = calloc(dtp->dt_provbuckets, sizeof (dt_provider_t *));
dt_proc_hash_create(dtp);
dtp->dt_vmax = DT_VERS_LATEST;
dtp->dt_cpp_path = strdup(_dtrace_defcpp);
dtp->dt_cpp_path = NULL;
for (i = 0; i < (int)sizeof(_dtrace_defcpps) / sizeof(_dtrace_defcpps[0]); ++i) {
if (access(_dtrace_defcpps[i], X_OK) == 0) {
dtp->dt_cpp_path = strdup(_dtrace_defcpps[i]);
break;
}
}
if (dtp->dt_cpp_path == NULL)
dtp->dt_cpp_path = strdup("cpp");
dtp->dt_cpp_argv = malloc(sizeof (char *));
dtp->dt_cpp_argc = 1;
dtp->dt_cpp_args = 1;