Skip to content
Snippets Groups Projects
Commit c60be60d authored by Steve Lhomme's avatar Steve Lhomme
Browse files

contrib: qt: add the prefix path when building with CMake

The PATH set in HOSTVARS_CMAKE is not kept when calling CMAKEBUILD.
We need that path to have access to the "cross compiled" fxc2.
parent c8760892
No related branches found
No related tags found
1 merge request!5806contrib: qt: add the prefix path when building with CMake
Pipeline #497716 failed with stage
in 57 minutes
......@@ -108,6 +108,6 @@ QTBASE_NATIVE_CONFIG := $(QTBASE_COMMON_CONFIG) -DQT_BUILD_TESTS=FALSE \
.qt: qt toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE) $(QTBASE_CONFIG)
+$(CMAKEBUILD)
+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
......@@ -34,6 +34,6 @@ qt5compat: qt5compat-everywhere-src-$(QT5COMPAT_VERSION).tar.xz .sum-qt5compat
.qt5compat: qt5compat toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE) $(QT5_COMPAT_CONFIG)
+$(CMAKEBUILD)
+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
......@@ -102,6 +102,6 @@ QT_DECLARATIVE_NATIVE_CONFIG := $(QT_DECLARATIVE_COMMON_CONFIG) \
.qtdeclarative: qtdeclarative toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE) $(QT_DECLARATIVE_CONFIG)
+$(CMAKEBUILD)
+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
......@@ -32,6 +32,6 @@ qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz .sum-qtsvg
.qtsvg: qtsvg toolchain.cmake
$(CMAKECLEAN)
$(HOSTVARS_CMAKE) $(CMAKE) $(QTSVG_CONFIG)
+$(CMAKEBUILD)
+PATH="$(PATH):$(PREFIX)/bin" $(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment