make: don't use .target in paths or printouts

test/lib/TestGyp.py

Index: test/lib/TestGyp.py
diff --git a/test/lib/TestGyp.py b/test/lib/TestGyp.py
index 7fbb56bfac8623b4960c9a99b0d048870075ecac..c32c959a2da098e71c0f332ab5b2d679412c02de 100644
--- a/test/lib/TestGyp.py
+++ b/test/lib/TestGyp.py
@@ -371,8 +371,9 @@ class TestGypMake(TestGypBase):
     """
     configuration = self.configuration_dirname()
     libdir = os.path.join('out', configuration, 'lib')
-    # TODO(piman): when everything is cross-compile safe, remove lib.target
-    os.environ['LD_LIBRARY_PATH'] = libdir + '.host:' + libdir + '.target'
+    # TODO(piman): when everything is cross-compile safe, remove
+    # the trailing 'libdir' that pulls in target-compiled libs as well.
+    os.environ['LD_LIBRARY_PATH'] = libdir + '.host:' + libdir
     # Enclosing the name in a list avoids prepending the original dir.
     program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)]
     return self.run(program=program, *args, **kw)
@@ -391,7 +392,7 @@ class TestGypMake(TestGypBase):
     prefixes and suffixes to a platform-independent library base name.
 
     A subdir= keyword argument specifies a library subdirectory within
-    the default 'obj.target'.
+    the default 'obj'.
     """
     result = []
     chdir = kw.get('chdir')
@@ -400,9 +401,9 @@ class TestGypMake(TestGypBase):
     configuration = self.configuration_dirname()
     result.extend(['out', configuration])
     if type == self.STATIC_LIB and sys.platform != 'darwin':
-      result.append('obj.target')
+      result.append('obj')
     elif type == self.SHARED_LIB and sys.platform != 'darwin':
-      result.append('lib.target')
+      result.append('lib')
     subdir = kw.get('subdir')
     if subdir:
       result.append(subdir)