diff --git a/Common/base.pri b/Common/base.pri index 15fd660303..7b41582266 100644 --- a/Common/base.pri +++ b/Common/base.pri @@ -203,22 +203,20 @@ core_linux { QMAKE_CUSTOM_SYSROOT = $$(QMAKE_CUSTOM_SYSROOT) QMAKE_CUSTOM_SYSROOT_BIN = $$(QMAKE_CUSTOM_SYSROOT)/usr/bin/ - # todo 32bit support? - core_linux_64 { - QMAKE_CUSTOM_SYSROOT_LIB = $$(QMAKE_CUSTOM_SYSROOT)/usr/lib/x86_64-linux-gnu - } + core_linux_64 { + !linux_arm64 { # x86_64 + QMAKE_CUSTOM_SYSROOT_LIB = $$(QMAKE_CUSTOM_SYSROOT)/usr/lib/x86_64-linux-gnu + !isEmpty(QMAKE_CUSTOM_SYSROOT) { + message("using custom sysroot $$QMAKE_CUSTOM_SYSROOT") + QMAKE_CC = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "gcc") + QMAKE_CXX = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++") + QMAKE_LINK = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++") + QMAKE_LINK_SHLIB = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++") - QMAKE_CUSTOM_SYSROOT_INCLUDE = $$(QMAKE_CUSTOM_SYSROOT)/usr/include - - !isEmpty(QMAKE_CUSTOM_SYSROOT) { - message("using custom sysroot $$QMAKE_CUSTOM_SYSROOT") - QMAKE_CC = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "gcc") - QMAKE_CXX = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++") - QMAKE_LINK = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++") - QMAKE_LINK_SHLIB = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++") - - QMAKE_CXXFLAGS += --sysroot $$QMAKE_CUSTOM_SYSROOT - QMAKE_LFLAGS += --sysroot $$QMAKE_CUSTOM_SYSROOT + QMAKE_CXXFLAGS += --sysroot $$QMAKE_CUSTOM_SYSROOT + QMAKE_LFLAGS += --sysroot $$QMAKE_CUSTOM_SYSROOT + } + } } } core_linux_host_arm64 {