diff options
| author | ruki <[email protected]> | 2018-10-16 00:49:09 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-10-15 22:54:56 +0800 |
| commit | 29598d7ee9489d7383ac2bb4da48264c99539477 (patch) | |
| tree | 10533890e42baeb26fe928c333206382d5c5f850 | |
| parent | e7bebb2e4c03c85e801c6b7e2e7131da5dec7869 (diff) | |
remove some unsupported nvcc flags
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | tests/projects/cuda/console/xmake.lua | 1 | ||||
| -rw-r--r-- | xmake/modules/core/tools/nvcc.lua | 26 |
3 files changed, 6 insertions, 29 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c0ab6f4c..bc2cf0322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ * Support fasm assembler * Add `has_config`, `get_config`, and `is_config` apis * Add `set_config` to set the default configuration -* Add `$ xmake --try` to try building project using third-party buildsystem +* Add `$xmake --try` to try building project using third-party buildsystem * Add `set_enabled(false)` to disable target * [#69](https://github.com/tboox/xmake/issues/69): Add remote package management, `add_requires("tbox ~1.6.1")` * [#216](https://github.com/tboox/xmake/pull/216): Add windows mfc rules @@ -21,6 +21,7 @@ * Improve to detect Qt sdk directory for `detect.sdks.find_qt` * [#184](https://github.com/tboox/xmake/issues/184): Improve `lib.detect.find_package` to support vcpkg * [#208](https://github.com/tboox/xmake/issues/208): Improve rpath for shared library +* [#225](https://github.com/tboox/xmake/issues/225): Improve to detect vs envirnoment ### Bug fixed @@ -488,9 +489,9 @@ ### 新特性 * 新增fasm汇编器支持 -* 添加`has_config`, `get_config`, ``和`is_config`接口去快速判断option和配置值 +* 添加`has_config`, `get_config`和`is_config`接口去快速判断option和配置值 * 添加`set_config`接口去设置默认配置 -* 添加`$ xmake --try`去尝试构建工程 +* 添加`$xmake --try`去尝试构建工程 * 添加`set_enabled(false)`去显示的禁用target * [#69](https://github.com/tboox/xmake/issues/69): 添加远程依赖包管理, `add_requires("tbox ~1.6.1")` * [#216](https://github.com/tboox/xmake/pull/216): 添加windows mfc编译规则 @@ -504,6 +505,7 @@ * 改进`detect.sdks.find_qt`对于Qt根目录的探测 * [#184](https://github.com/tboox/xmake/issues/184): 改进`lib.detect.find_package`支持vcpkg * [#208](https://github.com/tboox/xmake/issues/208): 改进rpath对动态库的支持 +* [#225](https://github.com/tboox/xmake/issues/225): 改进vs环境探测 ### Bugs修复 diff --git a/tests/projects/cuda/console/xmake.lua b/tests/projects/cuda/console/xmake.lua index a1590891e..b50beb03c 100644 --- a/tests/projects/cuda/console/xmake.lua +++ b/tests/projects/cuda/console/xmake.lua @@ -21,3 +21,4 @@ target("cuda_console") add_cuflags("-gencode arch=compute_" .. sm .. ",code=compute_" .. sm) add_ldflags("-gencode arch=compute_" .. sm .. ",code=compute_" .. sm) + diff --git a/xmake/modules/core/tools/nvcc.lua b/xmake/modules/core/tools/nvcc.lua index 0e9a16dc2..316dae6ea 100644 --- a/xmake/modules/core/tools/nvcc.lua +++ b/xmake/modules/core/tools/nvcc.lua @@ -48,10 +48,6 @@ function init(self) ["-W1"] = "-Wall" , ["-W2"] = "-Wall" , ["-W3"] = "-Wall" - - -- strip - , ["-s"] = "-s" - , ["-S"] = "-S" } -- init buildmodes @@ -66,27 +62,6 @@ function get(self, name) return _g[name] end --- make the strip flag -function nf_strip(self, level) - - -- the maps - local maps = - { - debug = "-S" - , all = "-s" - } - - -- for macho target - local plat = config.plat() - if plat == "macosx" or plat == "iphoneos" then - maps.all = "-Wl,-x" - maps.debug = "-Wl,-S" - end - - -- make it - return maps[level] -end - -- make the symbol flag function nf_symbol(self, level) @@ -94,7 +69,6 @@ function nf_symbol(self, level) local maps = { debug = "-g" - , hidden = "-fvisibility=hidden" } -- make it |
