Commit 8608404f authored by Jan Arne Petersen's avatar Jan Arne Petersen Committed by The Qt Project
Browse files

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: default avatarMichael Bruning <michael.bruning@digia.com>
Reviewed-by: default avatarPierre Rossi <pierre.rossi@gmail.com>
Showing with 1 addition and 1 deletion
...@@ -79,7 +79,7 @@ for (library, LIBRARIES): LIBS -= "$$library" ...@@ -79,7 +79,7 @@ for (library, LIBRARIES): LIBS -= "$$library"
GYP_CONTENTS += " 'ldflags': [" GYP_CONTENTS += " 'ldflags': ["
for (lib, LIBS): GYP_CONTENTS += " '$$lib'," 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 += " ]," GYP_CONTENTS += " ],"
!isEmpty(QMAKE_CFLAGS) { !isEmpty(QMAKE_CFLAGS) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment