From 6762c79080f2711b7e70b1d005228406e94f9c6c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 12 Jul 2013 14:57:50 +0200 Subject: don't link frameworks transitively Change-Id: I00443f33331e851838304f12aea7644b352839c8 Reviewed-by: Christian Kandeler --- share/qbs/modules/cpp/gcc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js index 3e55f6b0a..cf2caffed 100644 --- a/share/qbs/modules/cpp/gcc.js +++ b/share/qbs/modules/cpp/gcc.js @@ -5,8 +5,8 @@ function libraryLinkerFlags(product, inputs) var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.staticlibrary, 'cpp', 'staticLibraries'); var frameworkPaths = ModUtils.moduleProperties(product, 'frameworkPaths'); var systemFrameworkPaths = ModUtils.moduleProperties(product, 'systemFrameworkPaths'); - var frameworks = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'frameworks'); - var weakFrameworks = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'weakFrameworks'); + var frameworks = ModUtils.moduleProperties(product, 'frameworks'); + var weakFrameworks = ModUtils.moduleProperties(product, 'weakFrameworks'); var rpaths = ModUtils.moduleProperties(product, 'rpaths'); var args = [], i, prefix, suffix; -- cgit v1.2.1