fix gcc pcheaders #5858

xmake-io · Nov 28, 2024 · f85b045 · f85b045
1 parent 2c973f5
commit f85b045
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua
@@ -42,14 +42,14 @@ language("c++")
         ,   "target.vectorexts:check"
         ,   "target.languages"
         ,   "target.runtimes"
+        ,   "target.pcxxheader"
         ,   "target.includedirs"
         ,   "target.defines"
         ,   "target.undefines"
         ,   "target.frameworkdirs"
         ,   "target.frameworks"
         ,   "target.exceptions"
         ,   "target.encodings"
-        ,   "target.pcxxheader"
         ,   "target.forceincludes"
         ,   "toolchain.includedirs"
         ,   "toolchain.defines"

diff --git a/xmake/languages/c/xmake.lua b/xmake/languages/c/xmake.lua
@@ -42,14 +42,14 @@ language("c")
         ,   "target.vectorexts:check"
         ,   "target.languages"
         ,   "target.runtimes"
+        ,   "target.pcheader"
         ,   "target.includedirs"
         ,   "target.defines"
         ,   "target.undefines"
         ,   "target.frameworkdirs"
         ,   "target.frameworks"
         ,   "target.exceptions"
         ,   "target.encodings"
-        ,   "target.pcheader"
         ,   "target.forceincludes"
         ,   "toolchain.includedirs"
         ,   "toolchain.defines"

diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua
@@ -61,15 +61,15 @@ language("objc++")
         ,   "target.optimize:check"
         ,   "target.vectorexts:check"
         ,   "target.languages"
+        ,   "target.pmheader"
+        ,   "target.pmxxheader"
         ,   "target.includedirs"
         ,   "target.defines"
         ,   "target.undefines"
         ,   "target.frameworkdirs"
         ,   "target.frameworks"
         ,   "target.exceptions"
         ,   "target.encodings"
-        ,   "target.pmheader"
-        ,   "target.pmxxheader"
         ,   "target.forceincludes"
         ,   "toolchain.includedirs"
         ,   "toolchain.defines"

diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
@@ -497,7 +497,7 @@ function nf_pcheader(self, pcheaderfile, opt)
         if self:name() == "clang" then
             return {"-include", pcheaderfile, "-include-pch", pcoutputfile}
         else
-            return {"-include", path.filename(pcheaderfile), "-I", path.directory(pcoutputfile)}
+            return {"-I", path.directory(pcoutputfile), "-include", path.filename(pcheaderfile)}
         end
     end
 end
@@ -510,7 +510,7 @@ function nf_pcxxheader(self, pcheaderfile, opt)
         if self:name() == "clang" then
             return {"-include", pcheaderfile, "-include-pch", pcoutputfile}
         else
-            return {"-include", path.filename(pcheaderfile), "-I", path.directory(pcoutputfile)}
+            return {"-I", path.directory(pcoutputfile), "-include", path.filename(pcheaderfile)}
         end
     end
 end
@@ -523,7 +523,7 @@ function nf_pmheader(self, pcheaderfile, opt)
         if self:name() == "clang" then
             return {"-include", pcheaderfile, "-include-pch", pcoutputfile}
         else
-            return {"-include", path.filename(pcheaderfile), "-I", path.directory(pcoutputfile)}
+            return {"-I", path.directory(pcoutputfile), "-include", path.filename(pcheaderfile)}
         end
     end
 end
@@ -536,7 +536,7 @@ function nf_pmxxheader(self, pcheaderfile, opt)
         if self:name() == "clang" then
             return {"-include", pcheaderfile, "-include-pch", pcoutputfile}
         else
-            return {"-include", path.filename(pcheaderfile), "-I", path.directory(pcoutputfile)}
+            return {"-I", path.directory(pcoutputfile), "-include", path.filename(pcheaderfile)}
         end
     end
 end