Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(779)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: test/make_global_settings/basics/gyptest-make_global_settings.py

Issue 23475025: ninja/mac: Don't link c-file-only targets to libstdc++ Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« pylib/gyp/generator/ninja.py ('K') | « test/compiler-override/gyptest-compiler-env.py ('k') | test/make_global_settings/basics/make_global_settings.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/make_global_settings/basics/gyptest-make_global_settings.py
===================================================================
--- test/make_global_settings/basics/gyptest-make_global_settings.py (revision 1718)
+++ test/make_global_settings/basics/gyptest-make_global_settings.py (working copy)
@@ -27,17 +27,17 @@
"""
if sys.platform == 'linux2':
link_expected = """
-LINK ?= flock $(builddir)/linker.lock $(abspath clang++)
+LINK ?= flock $(builddir)/linker.lock $(abspath clang)
"""
elif sys.platform == 'darwin':
link_expected = """
-LINK ?= ./gyp-mac-tool flock $(builddir)/linker.lock $(abspath clang++)
+LINK ?= ./gyp-mac-tool flock $(builddir)/linker.lock $(abspath clang)
"""
test.must_contain('Makefile', cc_expected)
test.must_contain('Makefile', link_expected)
if test.format == 'ninja':
cc_expected = 'cc = ' + os.path.join('..', '..', 'clang')
- ld_expected = 'ld = $cxx'
+ ld_expected = 'ld = $cc'
if sys.platform == 'win32':
ld_expected = 'link.exe'
test.must_contain('out/Default/build.ninja', cc_expected)
« pylib/gyp/generator/ninja.py ('K') | « test/compiler-override/gyptest-compiler-env.py ('k') | test/make_global_settings/basics/make_global_settings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698