File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -71,11 +71,9 @@ unset OBJCPLUS_INCLUDE_PATH
7171
7272export C_INCLUDE_PATH=" ${NATIVE_GCC} /include"
7373export CPLUS_INCLUDE_PATH=" ${NATIVE_GCC} /include/c++:${NATIVE_GCC} /include"
74- export OBJC_INCLUDE_PATH=" ${NATIVE_GCC} /include"
75- export OBJCPLUS_INCLUDE_PATH=" ${NATIVE_GCC} /include/c++:${NATIVE_GCC} /include"
7674
7775case " $HOST " in
78- * darwin* ) export LIBRARY_PATH=" ${NATIVE_GCC} /lib" ;;
76+ * darwin* ) export LIBRARY_PATH=" ${NATIVE_GCC} /lib" ;; # Required for qt/qmake
7977 * mingw* ) export LIBRARY_PATH=" ${NATIVE_GCC} /lib" ;;
8078 * )
8179 NATIVE_GCC_STATIC=" $( store_path gcc-toolchain static) "
@@ -180,6 +178,14 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \
180178 x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \
181179 x86_64_linux_STRIP=x86_64-linux-gnu-strip
182180
181+ case " $HOST " in
182+ * darwin* )
183+ # Unset now that Qt is built
184+ unset C_INCLUDE_PATH
185+ unset CPLUS_INCLUDE_PATH
186+ unset LIBRARY_PATH
187+ ;;
188+ esac
183189
184190# ##########################
185191# Source Tarball Building #
You can’t perform that action at this time.
0 commit comments