diff options
Diffstat (limited to 'mkspecs/unsupported/linux-armcc/qmake.conf')
| -rw-r--r-- | mkspecs/unsupported/linux-armcc/qmake.conf | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/mkspecs/unsupported/linux-armcc/qmake.conf b/mkspecs/unsupported/linux-armcc/qmake.conf index a65f8d534e..2c7eb7c2d8 100644 --- a/mkspecs/unsupported/linux-armcc/qmake.conf +++ b/mkspecs/unsupported/linux-armcc/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += incremental armcc_linker +CONFIG += incremental armcc_linker QMAKE_INCREMENTAL_STYLE = sublib include(../../common/linux.conf) @@ -11,19 +11,19 @@ include(../../common/armcc.conf) load(qt_config) # use armcc for linking since armlink doesn't understand the arm_linux_config_file option -QMAKE_LINK = armcc -QMAKE_LINK_SHLIB = armcc -QMAKE_LINK_C = armcc -QMAKE_LINK_C_SHLIB = armcc +QMAKE_LINK = armcc +QMAKE_LINK_SHLIB = armcc +QMAKE_LINK_C = armcc +QMAKE_LINK_C_SHLIB = armcc -QMAKE_LFLAGS_SHLIB += --apcs=/fpic --shared +QMAKE_LFLAGS_SHLIB += --apcs=/fpic --shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LIBS += libstdc++.so librt.so +QMAKE_LIBS += libstdc++.so librt.so -CONFIG -= rvct_linker +CONFIG -= rvct_linker -QMAKE_CFLAGS += --gnu --arm_linux --dllimport_runtime --thumb --cpu Cortex-A9 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths --apcs=/interwork --visibility_inlines_hidden --diag_suppress 1300,2523 -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --cpp +QMAKE_CFLAGS += --gnu --arm_linux --dllimport_runtime --thumb --cpu Cortex-A9 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths --apcs=/interwork --visibility_inlines_hidden --diag_suppress 1300,2523 +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --cpp -QMAKE_LFLAGS += --diag_suppress 6331,6780,6439 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths +QMAKE_LFLAGS += --diag_suppress 6331,6780,6439 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths |