diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-12-01 20:13:08 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-12-03 11:25:56 +0000 |
| commit | 521a85395da1a2728902816c072ec46bcb0ad380 (patch) | |
| tree | cc3f0cd306563c9fe30f1518d8654e396e571a61 /src/network | |
| parent | 46a2b44b2b7f50ced7f2c0731cc6224478d960c7 (diff) | |
configure: actually resolve libraries into full filepaths
this considerably speeds up failures, as no doomed build is attempted,
and produces more reliable results, as no second lookup (which would be
subject to environment changes) is done any more during the build.
in principle, this also opens up possibilities like selecting specific
variants of dependencies, automatically extracting rpaths, etc.
qt_helper_lib.prf also needs to create fully resolved library names now.
Change-Id: I65f13564b635433030e40fa017427bbc72d1c130
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/configure.json | 1 | ||||
| -rw-r--r-- | src/network/configure.pri | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index 327131ba11..019f8378c7 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -32,7 +32,6 @@ ] }, "network": { - "export": "", "sources": [ { "type": "makeSpec", "spec": "NETWORK" } ] diff --git a/src/network/configure.pri b/src/network/configure.pri index fa502db1d1..ad4d711cba 100644 --- a/src/network/configure.pri +++ b/src/network/configure.pri @@ -1,10 +1,10 @@ # custom tests defineTest(qtConfLibrary_openssl) { - libs = $$getenv("OPENSSL_LIBS") + eval(libs = $$getenv("OPENSSL_LIBS")) !isEmpty(libs) { - eval($${1}.libs = $$libs) - export($${1}.libs) + !qtConfResolveLibs($${1}.libs, $$libs): \ + return(false) return(true) } qtLog("$OPENSSL_LIBS is not set.") |