git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compiler: Don't use import path for ./ or ../ imports. 

From-SVN: r183261
This commit is contained in:
Ian Lance Taylor 2012-01-17 19:50:59 +00:00
parent ee3d2ecdc5
commit cd2705aade
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gcc/go/gofrontend/import.cc
View File

@ -42,8 +42,8 @@ const char* const Import::import_marker = "*imported*";
// returns a pointer to a Stream object to read the data that it
// exports. If the file is not found, it returns NULL.
// When FILENAME is not an absolute path, we use the search path
// provided by -I and -L options.
// When FILENAME is not an absolute path and does not start with ./ or
// ../, we use the search path provided by -I and -L options.
// When FILENAME does not exist, we try modifying FILENAME to find the
// file. We use the first of these which exists:
@ -61,7 +61,18 @@ const char* const Import::import_marker = "*imported*";
Import::Stream*
Import::open_package(const std::string& filename, Location location)
{
if (!IS_ABSOLUTE_PATH(filename))
bool is_local;
if (IS_ABSOLUTE_PATH(filename))
is_local = true;
else if (filename[0] == '.' && IS_DIR_SEPARATOR(filename[1]))
is_local = true;
else if (filename[0] == '.'
&& filename[1] == '.'
&& IS_DIR_SEPARATOR(filename[2]))
is_local = true;
else
is_local = false;
if (!is_local)
{
for (std::vector<std::string>::const_iterator p = search_path.begin();
p != search_path.end();