diff options
| author | ruki <[email protected]> | 2021-02-02 22:30:58 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-02-02 22:30:58 +0800 |
| commit | c6295867f7b6cd61a34c1ab01b98fddac8299fc3 (patch) | |
| tree | 579090b519cabcc71011fd8e973b18fd56c555fb | |
| parent | e0b610d9bd2e87828ac4fc5435aca1ff191fbb85 (diff) | |
remove fpic for windows/qt
| -rw-r--r-- | xmake/actions/require/install.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/qt/load.lua | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/xmake/actions/require/install.lua b/xmake/actions/require/install.lua index 888f64978..c39569713 100644 --- a/xmake/actions/require/install.lua +++ b/xmake/actions/require/install.lua @@ -75,7 +75,9 @@ end -- register the base info of required package function _register_required_package_base(instance, requireinfo) - requireinfo:set("__installdir", instance:installdir()) + if not instance:isSys() and not instance:is3rd() then + requireinfo:set("__installdir", instance:installdir()) + end end -- register the required local package diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index b7fc91408..5962fcd89 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -102,9 +102,11 @@ function main(target, opt) end -- add -fPIC - target:add("cxflags", "-fPIC") - target:add("mxflags", "-fPIC") - target:add("asflags", "-fPIC") + if not target:is_plat("windows", "mingw") then + target:add("cxflags", "-fPIC") + target:add("mxflags", "-fPIC") + target:add("asflags", "-fPIC") + end -- need c++11 at least local languages = target:get("languages") |