Browse Source

update ld name

ruki 5 years ago
parent
commit
9cb312d79b

+ 11 - 11
README.md

@@ -680,18 +680,18 @@ $ xmake
 | [--ld](#-ld)                 | Set `c/c++/objc/asm` linker                  |
 | [--sh](#-sh)                 | Set `c/c++/objc/asm` shared library linker   |
 | [--ar](#-ar)                 | Set `c/c++/objc/asm` static library archiver |
-| [--sc-ld](#-sc-ld)           | Set `swift` linker                           |
-| [--sc-sh](#-sc-sh)           | Set `swift` shared library linker            |
-| [--gc-ld](#-gc-ld)           | Set `golang` linker                          |
-| [--gc-ar](#-gc-ar)           | Set `golang` static library archiver         |
-| [--dc-ld](#-dc-ld)           | Set `dlang` linker                           |
-| [--dc-sh](#-dc-sh)           | Set `dlang` shared library linker            |
-| [--dc-ar](#-dc-ar)           | Set `dlang` static library archiver          |
-| [--rc-ld](#-rc-ld)           | Set `rust` linker                            |
-| [--rc-sh](#-rc-sh)           | Set `rust` shared library linker             |
-| [--rc-ar](#-rc-ar)           | Set `rust` static library archiver           |
+| [--scld](#-scld)           | Set `swift` linker                           |
+| [--scsh](#-scsh)           | Set `swift` shared library linker            |
+| [--gcld](#-gcld)           | Set `golang` linker                          |
+| [--gcar](#-gcar)           | Set `golang` static library archiver         |
+| [--dcld](#-dcld)           | Set `dlang` linker                           |
+| [--dcsh](#-dcsh)           | Set `dlang` shared library linker            |
+| [--dcar](#-dcar)           | Set `dlang` static library archiver          |
+| [--rcld](#-rcld)           | Set `rust` linker                            |
+| [--rcsh](#-rcsh)           | Set `rust` shared library linker             |
+| [--rcar](#-rcar)           | Set `rust` static library archiver           |
 | [--cu-cxx](#-cu-cxx)         | Set `cuda` host compiler                     |
-| [--cu-ld](#-cu-ld)           | Set `cuda` linker                            |
+| [--culd](#-culd)           | Set `cuda` linker                            |
 | [--asflags](#-asflags)       | Set `asm` assembler option                   |
 | [--cflags](#-cflags)         | Set `c` compiler option                      |
 | [--cxflags](#-cxflags)       | Set `c/c++` compiler option                  |

+ 12 - 12
guide/configuration.md

@@ -403,18 +403,18 @@ As long as the `--sdk=` and other parameters are set, the cross-compilation mode
 | [--ld](#-ld)                 | Set `c/c++/objc/asm` linker                  |
 | [--sh](#-sh)                 | Set `c/c++/objc/asm` shared library linker   |
 | [--ar](#-ar)                 | Set `c/c++/objc/asm` static library archiver |
-| [--sc-ld](#-sc-ld)           | Set `swift` linker                           |
-| [--sc-sh](#-sc-sh)           | Set `swift` shared library linker            |
-| [--gc-ld](#-gc-ld)           | Set `golang` linker                          |
-| [--gc-ar](#-gc-ar)           | Set `golang` static library archiver         |
-| [--dc-ld](#-dc-ld)           | Set `dlang` linker                           |
-| [--dc-sh](#-dc-sh)           | Set `dlang` shared library linker            |
-| [--dc-ar](#-dc-ar)           | Set `dlang` static library archiver          |
-| [--rc-ld](#-rc-ld)           | Set `rust` linker                            |
-| [--rc-sh](#-rc-sh)           | Set `rust` shared library linker             |
-| [--rc-ar](#-rc-ar)           | Set `rust` static library archiver           |
-| [--cu-cxx](#-cu-cxx)         | Set `cuda` host compiler                     |
-| [--cu-ld](#-cu-ld)           | Set `cuda` linker                            |
+| [--scld](#-scld)             | Set `swift` linker                           |
+| [--scsh](#-scsh)             | Set `swift` shared library linker            |
+| [--gcld](#-gcld)             | Set `golang` linker                          |
+| [--gcar](#-gcar)             | Set `golang` static library archiver         |
+| [--dcld](#-dcld)             | Set `dlang` linker                           |
+| [--dcsh](#-dcsh)             | Set `dlang` shared library linker            |
+| [--dcar](#-dcar)             | Set `dlang` static library archiver          |
+| [--rcld](#-rcld)             | Set `rust` linker                            |
+| [--rcsh](#-rcsh)             | Set `rust` shared library linker             |
+| [--rcar](#-rcar)             | Set `rust` static library archiver           |
+| [--cu-ccbin](#-cu-ccbin)     | Set `cuda` host compiler                     |
+| [--culd](#-culd)             | Set `cuda` linker                            |
 | [--asflags](#-asflags)       | Set `asm` assembler option                   |
 | [--cflags](#-cflags)         | Set `c` compiler option                      |
 | [--cxflags](#-cxflags)       | Set `c/c++` compiler option                  |

+ 3 - 3
manual/extension_modules.md

@@ -797,9 +797,9 @@ The results are as follows:
 
 ```lua
 {
-     binary = {"ld", "gc-ld", "dc-ld"}
-,    static = {"ar", "gc-ar", "dc-ar"}
-,    shared = {"sh", "dc-sh"}
+     binary = {"ld", "gcld", "dcld"}
+,    static = {"ar", "gcar", "dcar"}
+,    shared = {"sh", "dcsh"}
 }
 ```
 

+ 5 - 5
old/manual.md

@@ -2920,8 +2920,8 @@ The previous parameter is key, which is used to specify the tool type. Currently
 | ld | Common executable program linker such as c/c++/asm/objc |
 | sh | c/c++/asm/objc and other universal dynamic library linker |
 | ar | general static library archiver such as c/c++/asm/objc |
-| dc-ld | dlang executable linker, rc-ld/gc-ld, etc. |
-Dc-sh | dlang dynamic library linker, rc-sh/gc-sh, etc. |
+| dcld | dlang executable linker, rcld/gcld, etc. |
+Dc-sh | dlang dynamic library linker, rcsh/gcsh, etc. |
 
 For some compiler file names that are irregular, causing xmake to fail to recognize the known compiler name, we can also add a tool name prompt, for example:
 
@@ -7569,9 +7569,9 @@ The results are as follows:
 
 ```lua
 {
-     binary = {"ld", "gc-ld", "dc-ld"}
-,    static = {"ar", "gc-ar", "dc-ar"}
-,    shared = {"sh", "dc-sh"}
+     binary = {"ld", "gcld", "dcld"}
+,    static = {"ar", "gcar", "dcar"}
+,    shared = {"sh", "dcsh"}
 }
 ```
 

+ 5 - 5
old/zh/manual.md

@@ -2940,8 +2940,8 @@ add_tools("mm", "$(projectdir)/tools/bin/clang-5.0")
 | ld           | c/c++/asm/objc等通用可执行程序链接器 |
 | sh           | c/c++/asm/objc等通用动态库链接器     |
 | ar           | c/c++/asm/objc等通用静态库归档器     |
-| dc-ld        | dlang可执行链接器, rc-ld/gc-ld等类似 |
-| dc-sh        | dlang动态库链接器, rc-sh/gc-sh等类似 |
+| dcld        | dlang可执行链接器, rcld/gcld等类似 |
+| dcsh        | dlang动态库链接器, rcsh/gcsh等类似 |
 
 对于一些编译器文件名不规则,导致xmake无法正常识别处理为已知的编译器名的情况下,我们也可以加一个工具名提示,例如:
 
@@ -7655,9 +7655,9 @@ print(project.version())
 
 ```lua
 {
-     binary = {"ld", "gc-ld", "dc-ld"}
-,    static = {"ar", "gc-ar", "dc-ar"}
-,    shared = {"sh", "dc-sh"}
+     binary = {"ld", "gcld", "dcld"}
+,    static = {"ar", "gcar", "dcar"}
+,    shared = {"sh", "dcsh"}
 }
 ```
 

+ 11 - 11
zh-cn/README.md

@@ -711,18 +711,18 @@ $ xmake
 | [--ld](#-ld)                 | 设置`c/c++/objc/asm`链接器       |
 | [--sh](#-sh)                 | 设置`c/c++/objc/asm`共享库链接器 |
 | [--ar](#-ar)                 | 设置`c/c++/objc/asm`静态库归档器 |
-| [--sc-ld](#-sc-ld)           | 设置`swift`链接器                |
-| [--sc-sh](#-sc-sh)           | 设置`swift`共享库链接器          |
-| [--gc-ld](#-gc-ld)           | 设置`golang`链接器               |
-| [--gc-ar](#-gc-ar)           | 设置`golang`静态库归档器         |
-| [--dc-ld](#-dc-ld)           | 设置`dlang`链接器                |
-| [--dc-sh](#-dc-sh)           | 设置`dlang`共享库链接器          |
-| [--dc-ar](#-dc-ar)           | 设置`dlang`静态库归档器          |
-| [--rc-ld](#-rc-ld)           | 设置`rust`链接器                 |
-| [--rc-sh](#-rc-sh)           | 设置`rust`共享库链接器           |
-| [--rc-ar](#-rc-ar)           | 设置`rust`静态库归档器           |
+| [--scld](#-scld)           | 设置`swift`链接器                |
+| [--scsh](#-scsh)           | 设置`swift`共享库链接器          |
+| [--gcld](#-gcld)           | 设置`golang`链接器               |
+| [--gcar](#-gcar)           | 设置`golang`静态库归档器         |
+| [--dcld](#-dcld)           | 设置`dlang`链接器                |
+| [--dcsh](#-dcsh)           | 设置`dlang`共享库链接器          |
+| [--dcar](#-dcar)           | 设置`dlang`静态库归档器          |
+| [--rcld](#-rcld)           | 设置`rust`链接器                 |
+| [--rcsh](#-rcsh)           | 设置`rust`共享库链接器           |
+| [--rcar](#-rcar)           | 设置`rust`静态库归档器           |
 | [--cu-cxx](#-cu-cxx)         | 设置`cuda` host编译器            |
-| [--cu-ld](#-cu-ld)           | 设置`cuda`链接器                 |
+| [--culd](#-culd)           | 设置`cuda`链接器                 |
 | [--asflags](#-asflags)       | 设置`asm`汇编编译选项            |
 | [--cflags](#-cflags)         | 设置`c`编译选项                  |
 | [--cxflags](#-cxflags)       | 设置`c/c++`编译选项              |

+ 12 - 12
zh-cn/guide/configuration.md

@@ -399,18 +399,18 @@ $ xmake
 | [--ld](#-ld)                 | 设置`c/c++/objc/asm`链接器       |
 | [--sh](#-sh)                 | 设置`c/c++/objc/asm`共享库链接器 |
 | [--ar](#-ar)                 | 设置`c/c++/objc/asm`静态库归档器 |
-| [--sc-ld](#-sc-ld)           | 设置`swift`链接器                |
-| [--sc-sh](#-sc-sh)           | 设置`swift`共享库链接器          |
-| [--gc-ld](#-gc-ld)           | 设置`golang`链接器               |
-| [--gc-ar](#-gc-ar)           | 设置`golang`静态库归档器         |
-| [--dc-ld](#-dc-ld)           | 设置`dlang`链接器                |
-| [--dc-sh](#-dc-sh)           | 设置`dlang`共享库链接器          |
-| [--dc-ar](#-dc-ar)           | 设置`dlang`静态库归档器          |
-| [--rc-ld](#-rc-ld)           | 设置`rust`链接器                 |
-| [--rc-sh](#-rc-sh)           | 设置`rust`共享库链接器           |
-| [--rc-ar](#-rc-ar)           | 设置`rust`静态库归档器           |
-| [--cu-cxx](#-cu-cxx)         | 设置`cuda` host编译器            |
-| [--cu-ld](#-cu-ld)           | 设置`cuda`链接器                 |
+| [--scld](#-scld)             | 设置`swift`链接器                |
+| [--scsh](#-scsh)             | 设置`swift`共享库链接器          |
+| [--gcld](#-gcld)             | 设置`golang`链接器               |
+| [--gcar](#-gcar)             | 设置`golang`静态库归档器         |
+| [--dcld](#-dcld)             | 设置`dlang`链接器                |
+| [--dcsh](#-dcsh)             | 设置`dlang`共享库链接器          |
+| [--dcar](#-dcar)             | 设置`dlang`静态库归档器          |
+| [--rcld](#-rcld)             | 设置`rust`链接器                 |
+| [--rcsh](#-rcsh)             | 设置`rust`共享库链接器           |
+| [--rcar](#-rcar)             | 设置`rust`静态库归档器           |
+| [--cu-ccbin](#-cu-ccbin)     | 设置`cuda` host编译器            |
+| [--culd](#-culd)             | 设置`cuda`链接器                 |
 | [--asflags](#-asflags)       | 设置`asm`汇编编译选项            |
 | [--cflags](#-cflags)         | 设置`c`编译选项                  |
 | [--cxflags](#-cxflags)       | 设置`c/c++`编译选项              |

+ 3 - 3
zh-cn/manual/extension_modules.md

@@ -803,9 +803,9 @@ print(project.version())
 
 ```lua
 {
-     binary = {"ld", "gc-ld", "dc-ld"}
-,    static = {"ar", "gc-ar", "dc-ar"}
-,    shared = {"sh", "dc-sh"}
+     binary = {"ld", "gcld", "dcld"}
+,    static = {"ar", "gcar", "dcar"}
+,    shared = {"sh", "dcsh"}
 }
 ```
 

+ 2 - 2
zh-cn/manual/project_target.md

@@ -1813,8 +1813,8 @@ target("test2")
 | ld           | c/c++/asm/objc等通用可执行程序链接器 |
 | sh           | c/c++/asm/objc等通用动态库链接器     |
 | ar           | c/c++/asm/objc等通用静态库归档器     |
-| dc-ld        | dlang可执行链接器, rc-ld/gc-ld等类似 |
-| dc-sh        | dlang动态库链接器, rc-sh/gc-sh等类似 |
+| dcld        | dlang可执行链接器, rcld/gcld等类似 |
+| dcsh        | dlang动态库链接器, rcsh/gcsh等类似 |
 
 对于一些编译器文件名不规则,导致xmake无法正常识别处理为已知的编译器名的情况下,我们也可以加一个工具名提示,例如: