Ticket #3869: t3869_BuildError.diff
File t3869_BuildError.diff, 1.7 KB (added by , 8 years ago) |
---|
-
build/premake/premake4.lua
282 282 283 283 if os.is("linux") or os.is("bsd") then 284 284 linkoptions { "-Wl,--no-undefined", "-Wl,--as-needed" } 285 buildoptions { "-fPIC" } 285 286 end 286 287 287 288 if arch == "x86" then … … 369 370 if os.is("linux") or os.is("bsd") then 370 371 -- To use our local shared libraries, they need to be found in the 371 372 -- runtime dynamic linker path. Add their path to -rpath. 373 buildoptions { "-fPIC" } 372 374 if _OPTIONS["libdir"] then 373 375 linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] } 374 376 else … … 845 847 end 846 848 847 849 if os.is("linux") then 850 buildoptions { "-fPIC" } 848 851 if _OPTIONS["android"] then 849 852 table.insert(source_dirs, "lib/sysdep/os/android") 850 853 else … … 978 981 project_add_manifest() 979 982 980 983 elseif os.is("linux") or os.is("bsd") then 981 984 buildoptions { "-fPIC" } 982 985 if not _OPTIONS["android"] and not (os.getversion().description == "OpenBSD") then 983 986 links { "rt" } 984 987 end … … 1231 1234 -- (TODO: It'd be nice to fix FCollada, but that looks hard) 1232 1235 buildoptions { "-fno-strict-aliasing" } 1233 1236 1234 buildoptions { "-rdynamic" }1237 buildoptions { "-rdynamic", "-fPIC" } 1235 1238 linkoptions { "-rdynamic" } 1236 1237 1239 elseif os.is("bsd") then 1238 1240 if os.getversion().description == "OpenBSD" then 1239 1241 links { "c", } … … 1422 1424 project_add_manifest() 1423 1425 1424 1426 elseif os.is("linux") or os.is("bsd") then 1425 1427 buildoptions { "-fPIC" } 1426 1428 if not _OPTIONS["android"] and not (os.getversion().description == "OpenBSD") then 1427 1429 links { "rt" } 1428 1430 end