diff options
Diffstat (limited to 'share/qbs/modules/cpp/GenericGCC.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 680db41d9..1547d6a43 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -122,8 +122,6 @@ CppModule { args = args.concat([ '-Wl,--hash-style=gnu', '-Wl,--as-needed', - '-Wl,--allow-shlib-undefined', - '-Wl,--no-undefined', '-Wl,-soname=' + Gcc.soname(product, libFilePath) ]); } else if (product.moduleProperty("qbs", "targetOS").contains('darwin')) { @@ -309,16 +307,6 @@ CppModule { args = args.concat(["-sectcreate", "__TEXT", "__info_plist", inputs.infoplist[0].fileName]); } - if (product.moduleProperty("qbs", "targetOS").contains('linux')) { - var transitiveSOs = ModUtils.modulePropertiesFromArtifacts(product, - inputs.dynamiclibrary_copy, 'cpp', 'transitiveSOs') - var uniqueSOs = ModUtils.uniqueConcat([], transitiveSOs) - for (i in uniqueSOs) { - // The real library is located one level up. - args.push("-Wl,-rpath-link=" + FileInfo.path(FileInfo.path(uniqueSOs[i]))); - } - } - args = args.concat(Gcc.linkerFlags(product, inputs)); args = args.concat(Gcc.additionalCompilerAndLinkerFlags(product)); var cmd = new Command(ModUtils.moduleProperty(product, "linkerPath"), args); |