[llvm-commits] [LNT] r167406 - /lnt/trunk/lnt/tests/compile.py

[Daniel Dunbar]

Why is this necessary?

 - Daniel


On Nov 5, 2012, at 13:56, Michael Gottesman <mgottesman at apple.com> wrote:

> Author: mgottesman
> Date: Mon Nov  5 15:55:28 2012
> New Revision: 167406
>
> URL: http://llvm.org/viewvc/llvm-project?rev=167406&view=rev
> Log:
> [compile tests] Added support for ldxx argument to compile tests.
>
> This will set the LDPLUSPLUS variable in xcodebuild if it is passed
> in. Otherwise LDPLUSPLUS defaults back to the previous default of
> opt.cxx.
>
> Modified:
>    lnt/trunk/lnt/tests/compile.py
>
> Modified: lnt/trunk/lnt/tests/compile.py
> URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/compile.py?rev=167406&r1=167405&r2=167406&view=diff
> ==============================================================================
> --- lnt/trunk/lnt/tests/compile.py (original)
> +++ lnt/trunk/lnt/tests/compile.py Mon Nov  5 15:55:28 2012
> @@ -356,13 +356,13 @@
>
>         # Add arguments to force the appropriate compiler.
>         cmd.append('CC=%s' % (opts.cc,))
> -        cmd.append('CPLUSPLUS=%s' % (opts.cxx,))
> -        cmd.append('LD=%s' % (opts.ld,))
> -
> +        cmd.append('CPLUSPLUS=%s' % (opts.cxx,))
> +
>         # We need to force this variable here because Xcode has some completely
>         # broken logic for deriving this variable from the compiler
> -        # name. <rdar://problem/7989147>
> -        cmd.append('LDPLUSPLUS=%s' % (opts.cxx,))
> +        # name. <rdar://problem/7989147>
> +        cmd.append('LD=%s' % (opts.ld,))
> +        cmd.append('LDPLUSPLUS=%s' % (opts.ldxx,))
>
>         # Force off the static analyzer, in case it was enabled in any projects
>         # (we don't want to obscure what we are trying to time).
> @@ -659,7 +659,10 @@
>                          help="Path to the C++ compiler to test",
>                          type=str, default=None)
>         group.add_option("", "--ld", dest="ld",
> -                         help="Path to the ld to use.",
> +                         help="Path to the c linker to use. (Xcode Distinction)",
> +                         type=str, default=None)
> +        group.add_option("", "--ldxx", dest="ldxx",
> +                         help="Path to the cxx linker to use. (Xcode Distinction)",
>                          type=str, default=None)
>         group.add_option("", "--test-externals", dest="test_suite_externals",
>                          help="Path to the LLVM test-suite externals",
> @@ -758,6 +761,9 @@
>         # If no ld was set, set ld to opts.cc
>         if opts.ld is None:
>             opts.ld = opts.cc
> +        # If no ldxx was set, set ldxx to opts.cxx
> +        if opts.ldxx is None:
> +            opts.ldxx = opts.cxx
>
>         # Set up the sandbox.
>         global g_output_dir
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits