diff options
| author | OpportunityLiu <[email protected]> | 2019-07-22 17:55:46 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-07-22 17:56:04 +0800 |
| commit | 1cf79ba882fb24eca13829c12f6e39584ccd1f5f (patch) | |
| tree | 7e86499f2f2884e6db05d51c8442187160f6efb1 | |
| parent | 4fafbae0430e7f9b4a85d280d6fb0efbd2cf35b5 (diff) | |
fix bug when parapllel checking flags
| -rw-r--r-- | xmake/modules/detect/tools/nvcc/has_flags.lua | 5 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsproj/Xmake.targets | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/xmake/modules/detect/tools/nvcc/has_flags.lua b/xmake/modules/detect/tools/nvcc/has_flags.lua index a6f073a32..192402fd8 100644 --- a/xmake/modules/detect/tools/nvcc/has_flags.lua +++ b/xmake/modules/detect/tools/nvcc/has_flags.lua @@ -113,11 +113,10 @@ function _check_try_running(flags, opt, islinker) end -- check flags - local objectfile = is_plat("windows") and sourcefile .. ".o" or os.nuldev() if islinker then - return _try_running(opt.program, table.join(flags, "-o", objectfile, sourcefile)) + return _try_running(opt.program, table.join(flags, "-o", os.nuldev(), sourcefile)) else - return _try_running(opt.program, table.join(flags, "-c", "-o", objectfile, sourcefile)) + return _try_running(opt.program, table.join(flags, "-c", "-o", os.nuldev(), sourcefile)) end end diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets index 9276756a5..19bc4afaf 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets @@ -107,8 +107,7 @@ <File Include="$([MSBuild]::MakeRelative('$(XmakeProjectDirResolved)', $([System.IO.Path]::GetFullPath('%(SelectedFile.Identity)'))))" /> </ItemGroup> <PropertyGroup> - <FileList>@(File)</FileList> - <FileFlag>--files="$(FileList)"</FileFlag> + <FileFlag>--files="@(File)"</FileFlag> </PropertyGroup> <Message Text="$xmake build $(_XmakeCommonFlags) $(_XmakeBuildFileFlags) $(FileFlag) $(XmakeTarget)" Importance="High" /> <Exec StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv) |