From 5dc99c46786e91f2892c4318ed36054302e0c964 Mon Sep 17 00:00:00 2001 From: Simon Baldwin Date: Fri, 16 Nov 2012 17:14:05 +0000 Subject: cpplib.h (struct cpp_options): Add canonical_system_headers. * include/cpplib.h (struct cpp_options): Add canonical_system_headers. * files.c (find_file_in_dir): Call maybe_shorter_path() only if canonical_system_headers is set. * init.c (cpp_create_reader): Initialize canonical_system_headers. * configure.ac: Add new --enable-canonical-system-headers. * configure: Regenerate. * config.in: Regenerate. * doc/cppopts.texi: Document -f[no-]canonical-system-headers. * doc/install.texi: Document --enable-canonical-system-headers. * c.opt: Add f[no-]canonical-system-headers. * c-opts.c (c_common_handle_option): Handle OPT_fcanonical_system_headers. From-SVN: r193569 --- libcpp/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libcpp/files.c') diff --git a/libcpp/files.c b/libcpp/files.c index ecaa27414e1..a8288dc934d 100644 --- a/libcpp/files.c +++ b/libcpp/files.c @@ -389,7 +389,7 @@ find_file_in_dir (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch) void **pp; /* We try to canonicalize system headers. */ - if (file->dir->sysp) + if (CPP_OPTION (pfile, canonical_system_headers) && file->dir->sysp) { char * canonical_path = maybe_shorter_path (path); if (canonical_path) -- cgit v1.2.1