makefile: fix MacOS builds, restore missing env vars
For some reason the an infra change has triggered the behavior of `make` where the `if` clauses that compares `QT5_PKGCONFIG_INSTALL_PREFIX` with `QT5_INSTALL_PREFIX` would be true, which would cause `QT5_LIBDIR` to not be exported, and some `NIM_PARAMS` to not be set at all. Resolves: https://github.com/status-im/status-desktop/issues/10876 Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
35a2dd5244
commit
a0a5e6d219
5
Makefile
5
Makefile
|
@ -161,7 +161,7 @@ endif
|
||||||
|
|
||||||
# Qt5 dirs (we can't indent with tabs here)
|
# Qt5 dirs (we can't indent with tabs here)
|
||||||
ifneq ($(detected_OS),Windows)
|
ifneq ($(detected_OS),Windows)
|
||||||
QT5_LIBDIR := $(shell qmake -query QT_INSTALL_LIBS 2>/dev/null)
|
export QT5_LIBDIR := $(shell qmake -query QT_INSTALL_LIBS 2>/dev/null)
|
||||||
QT5_QMLDIR := $(shell qmake -query QT_INSTALL_QML 2>/dev/null)
|
QT5_QMLDIR := $(shell qmake -query QT_INSTALL_QML 2>/dev/null)
|
||||||
QT5_INSTALL_PREFIX := $(shell qmake -query QT_INSTALL_PREFIX 2>/dev/null)
|
QT5_INSTALL_PREFIX := $(shell qmake -query QT_INSTALL_PREFIX 2>/dev/null)
|
||||||
QT5_PKGCONFIG_INSTALL_PREFIX := $(shell pkg-config --variable=prefix Qt5Core 2>/dev/null)
|
QT5_PKGCONFIG_INSTALL_PREFIX := $(shell pkg-config --variable=prefix Qt5Core 2>/dev/null)
|
||||||
|
@ -169,6 +169,7 @@ ifneq ($(detected_OS),Windows)
|
||||||
QT5_PCFILEDIR := $(shell pkg-config --variable=pcfiledir Qt5Core 2>/dev/null)
|
QT5_PCFILEDIR := $(shell pkg-config --variable=pcfiledir Qt5Core 2>/dev/null)
|
||||||
else
|
else
|
||||||
QT5_PCFILEDIR := $(QT5_LIBDIR)/pkgconfig
|
QT5_PCFILEDIR := $(QT5_LIBDIR)/pkgconfig
|
||||||
|
endif
|
||||||
# some manually installed Qt5 instances have wrong paths in their *.pc files, so we pass the right one to the linker here
|
# some manually installed Qt5 instances have wrong paths in their *.pc files, so we pass the right one to the linker here
|
||||||
ifeq ($(detected_OS),Darwin)
|
ifeq ($(detected_OS),Darwin)
|
||||||
NIM_PARAMS += -L:"-framework Foundation -framework AppKit -framework Security -framework IOKit -framework CoreServices -framework LocalAuthentication"
|
NIM_PARAMS += -L:"-framework Foundation -framework AppKit -framework Security -framework IOKit -framework CoreServices -framework LocalAuthentication"
|
||||||
|
@ -176,11 +177,9 @@ ifneq ($(detected_OS),Windows)
|
||||||
NIM_PARAMS += --passL:"-headerpad_max_install_names"
|
NIM_PARAMS += --passL:"-headerpad_max_install_names"
|
||||||
NIM_PARAMS += --passL:"-F$(QT5_LIBDIR)"
|
NIM_PARAMS += --passL:"-F$(QT5_LIBDIR)"
|
||||||
|
|
||||||
export QT5_LIBDIR
|
|
||||||
else
|
else
|
||||||
NIM_PARAMS += --passL:"-L$(QT5_LIBDIR)"
|
NIM_PARAMS += --passL:"-L$(QT5_LIBDIR)"
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
DOTHERSIDE := vendor/DOtherSide/build/lib/libDOtherSideStatic.a
|
DOTHERSIDE := vendor/DOtherSide/build/lib/libDOtherSideStatic.a
|
||||||
DOTHERSIDE_CMAKE_PARAMS += -DENABLE_DYNAMIC_LIBS=OFF -DENABLE_STATIC_LIBS=ON
|
DOTHERSIDE_CMAKE_PARAMS += -DENABLE_DYNAMIC_LIBS=OFF -DENABLE_STATIC_LIBS=ON
|
||||||
# order matters here, due to "-Wl,-as-needed"
|
# order matters here, due to "-Wl,-as-needed"
|
||||||
|
|
Loading…
Reference in New Issue