Merge pull request #5512 from ChrisCatCP/export_all

fix export_all when use export_filter on arch x86
xmake-io · Aug 27, 2024 · 9216042 · 9216042
2 parents c3d03f9 + d6174f9
commit 9216042
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/xmake/rules/utils/symbols/export_all/export_all.lua b/xmake/rules/utils/symbols/export_all/export_all.lua
@@ -42,15 +42,15 @@ function _get_allsymbols_by_dumpbin(target, dumpbin, opt)
                     local symbol = line:match(".*External%s+| (.*)")
                     if symbol then
                         symbol = symbol:split('%s')[1]
+                        -- we need ignore DllMain, https://github.com/xmake-io/xmake/issues/3992
+                        if target:is_arch("x86") and symbol:startswith("_") and not symbol:startswith("__") and not symbol:startswith("_DllMain@") then
+                            symbol = symbol:sub(2)
+                        end
                         if export_filter then
                             if export_filter(symbol) then
                                 allsymbols:insert(symbol)
                             end
                         elseif not symbol:startswith("__") then
-                            -- we need ignore DllMain, https://github.com/xmake-io/xmake/issues/3992
-                            if target:is_arch("x86") and symbol:startswith("_") and not symbol:startswith("_DllMain@") then
-                                symbol = symbol:sub(2)
-                            end
                             if export_classes or not symbol:startswith("?") then
                                 if export_classes then
                                     if not symbol:startswith("??_G") and not symbol:startswith("??_E") then
@@ -83,15 +83,15 @@ function _get_allsymbols_by_objdump(target, objdump, opt)
                     local splitinfo = line:split("%s")
                     local symbol = splitinfo[#splitinfo]
                     if symbol then
+                        -- we need ignore DllMain, https://github.com/xmake-io/xmake/issues/3992
+                        if target:is_arch("x86") and symbol:startswith("_") and not symbol:startswith("__") and not symbol:startswith("_DllMain@") then
+                            symbol = symbol:sub(2)
+                        end
                         if export_filter then
                             if export_filter(symbol) then
                                 allsymbols:insert(symbol)
                             end
                         elseif not symbol:startswith("__") then
-                            -- we need ignore DllMain, https://github.com/xmake-io/xmake/issues/3992
-                            if target:is_arch("x86") and symbol:startswith("_") and not symbol:startswith("_DllMain@") then
-                                symbol = symbol:sub(2)
-                            end
                             if export_classes or not symbol:startswith("?") then
                                 if export_classes then
                                     if not symbol:startswith("??_G") and not symbol:startswith("??_E") then