diff options
| author | Jan Arne Petersen <jan.petersen@kdab.com> | 2013-09-30 13:41:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-01 08:28:56 +0200 |
| commit | 8608404f7991b910381e7b402f80b502177f4d6a (patch) | |
| tree | 537d482b7c1d0e2f4ec53c3a02d53dd030d361cd /build/qmake/mkspecs/features/gyp_generator.prf | |
| parent | cd51a2cdcfaaa176cb0935d01988dceb9941517b (diff) | |
Fix compilation with multiple rpath directories
Iterate over all diectories specified in QMAKE_RPATHDIR and generate a
rpath linker argument for each directory.
Change-Id: I90948eee9ef9319017ce99138ae7146d50c9636a
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'build/qmake/mkspecs/features/gyp_generator.prf')
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index 793655134..d75372d10 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -79,7 +79,7 @@ for (library, LIBRARIES): LIBS -= "$$library" GYP_CONTENTS += " 'ldflags': [" for (lib, LIBS): GYP_CONTENTS += " '$$lib'," -!isEmpty(QMAKE_RPATHDIR): GYP_CONTENTS += " '$$QMAKE_RPATH$$QMAKE_RPATHDIR'," +for (rpath, QMAKE_RPATHDIR): GYP_CONTENTS += " '$$QMAKE_RPATH$$rpath'," GYP_CONTENTS += " ]," !isEmpty(QMAKE_CFLAGS) { |