Skip to content

Commit 8b8831f

Browse files
committed
improve ldflags for autoconf
1 parent 5f1a07e commit 8b8831f

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

tests/projects/qt/quickapp/src/main.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#include <QGuiApplication>
22
#include <QQmlApplicationEngine>
33

4-
int main(int argc, char *argv[])
5-
{
4+
int main(int argc, char *argv[]) {
65
#if QT_VERSION >= 0x50601
76
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
87
#endif
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#include "mainwindow.h"
22
#include <QApplication>
33

4-
int main(int argc, char *argv[])
5-
{
4+
int main(int argc, char *argv[]) {
65
QApplication a(argc, argv);
76
MainWindow w;
87
w.show();
9-
108
return a.exec();
119
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#include "mainwindow.h"
22
#include <QApplication>
33

4-
int main(int argc, char *argv[])
5-
{
4+
int main(int argc, char *argv[]) {
65
QApplication a(argc, argv);
76
MainWindow w;
87
w.show();
9-
108
return a.exec();
119
}

xmake/modules/package/tools/autoconf.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,12 +339,9 @@ function buildenvs(package, opt)
339339
if arflags then
340340
envs.ARFLAGS = table.concat(_translate_paths(arflags), ' ')
341341
end
342-
if ldflags then
343-
envs.LDFLAGS = table.concat(_translate_paths(ldflags), ' ')
344-
end
345-
if shflags then
342+
if ldflags or shflags then
346343
-- autoconf does not use SHFLAGS
347-
envs.LDFLAGS = table.concat(_translate_paths(shflags), ' ')
344+
envs.LDFLAGS = table.concat(_translate_paths(table.join(ldflags or {}, shflags)), ' ')
348345
end
349346

350347
-- cross-compilation? pass the full build environments

0 commit comments

Comments
 (0)