rename goflags to gcflags

5 files changed, 52 insertions, 10 deletions

diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index 54cf28f3d..f913c61db 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -1176,14 +1176,14 @@ end
 --      {
 --          -- target.add_xxx
 --          "target.add_links"
---      ,   "target.add_goflags"
+--      ,   "target.add_gcflags"
 --      ,   "target.add_ldflags"
 --      ,   "target.add_arflags"
 --      ,   "target.add_shflags"
 --
 --          -- option.add_xxx
 --      ,   "option.add_links"
---      ,   "option.add_goflags"
+--      ,   "option.add_gcflags"
 --      ,   "option.add_ldflags"
 --      ,   "option.add_arflags"
 --      ,   "option.add_shflags"
diff --git a/xmake/languages/dlang/check_main.lua b/xmake/languages/dlang/check_main.lua
index 286485147..f69c4b142 100644
--- a/xmake/languages/dlang/check_main.lua
+++ b/xmake/languages/dlang/check_main.lua
@@ -30,6 +30,7 @@ function main(sourcefile)
 
     -- remove comment first
     sourcecode = sourcecode:gsub("/%*.-%*/", "")
+    sourcecode = sourcecode:gsub("/%+.-%+/", "")
     sourcecode = sourcecode:gsub("//.-\n", "\n")
 
     -- find func main() {
diff --git a/xmake/languages/golang/api.lua b/xmake/languages/golang/api.lua
index 0178f53c6..8ef4687a0 100644
--- a/xmake/languages/golang/api.lua
+++ b/xmake/languages/golang/api.lua
@@ -30,12 +30,12 @@ function apis()
     {
         -- target.add_xxx
         "target.add_links"
-    ,   "target.add_goflags"
+    ,   "target.add_gcflags"
     ,   "target.add_ldflags"
     ,   "target.add_arflags"
         -- option.add_xxx
     ,   "option.add_links"
-    ,   "option.add_goflags"
+    ,   "option.add_gcflags"
     ,   "option.add_ldflags"
     ,   "option.add_arflags"
     }
diff --git a/xmake/languages/golang/xmake.lua b/xmake/languages/golang/xmake.lua
index e1939dec7..de2bedab0 100755
--- a/xmake/languages/golang/xmake.lua
+++ b/xmake/languages/golang/xmake.lua
@@ -29,7 +29,7 @@ language("golang")
     set_sourcekinds {go = ".go"}
 
     -- set source file flags
-    set_sourceflags {go = "goflags"}
+    set_sourceflags {go = "gcflags"}
 
     -- set target kinds
     set_targetkinds {binary = "go-ld", static = "go-ar"}
@@ -86,11 +86,6 @@ language("golang")
         ,   "option.links"
         ,   "platform.links"
         }
-    ,   static = 
-        {
-            "target.strip"
-        ,   "target.symbols"
-        }
     }
 
     -- set menu
diff --git a/xmake/tools/go.lua b/xmake/tools/go.lua
index a8966404f..4d25792a3 100755
--- a/xmake/tools/go.lua
+++ b/xmake/tools/go.lua
@@ -58,6 +58,52 @@ function get(name)
     return _g[name]
 end
 
+-- make the optimize flag
+function nf_optimize(level)
+
+    -- the maps
+    local maps = 
+    {   
+        none        = "-N"
+    ,   fast        = ""
+    ,   faster      = ""
+    ,   fastest     = ""
+    ,   smallest    = ""
+    ,   aggressive  = ""
+    }
+
+    -- make it
+    return maps[level] or ""
+end
+
+-- make the symbol flag
+function nf_symbol(level)
+
+    -- the maps
+    local maps = 
+    {   
+        debug       = "-E"
+    ,   hidden      = ""
+    }
+
+    -- make it
+    return maps[level] or ""
+end
+
+-- make the strip flag
+function nf_strip(level)
+
+    -- the maps
+    local maps = 
+    {   
+        debug       = "-s"
+    ,   all         = "-s"
+    }
+
+    -- make it
+    return maps[level] or ""
+end
+
 -- make the includedir flag
 function nf_includedir(dir)