Install x86_64 toolchain last

Author: mvidalpinol

Dockerfile

@@ -172,14 +172,6 @@ ENV LDFLAGS=
 #INSTALL TOOLCHAIN
 WORKDIR /tmp/work
 
-#X86_64
-RUN make \
-    PREFIX_TARGET=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG} \
-    PREFIX_HOST=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG} \
-    PLATFORM=qdma \
-    all \
- && make mrproper
-
 #ARM64
 RUN make \
     TARGET=aarch64-linux-gnu \
@@ -204,6 +196,15 @@ RUN make \
     all \
  && make mrproper
 
+#X86_64
+# We install x86_64 the last so the default target for clang is set to x86
+RUN make \
+    PREFIX_TARGET=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG} \
+    PREFIX_HOST=$INSTALLATION_PREFIX/x86_64/ompss-2/${RELEASE_TAG} \
+    PLATFORM=qdma \
+    all \
+ && make mrproper
+
 FROM build AS dist_img
 ARG INSTALLATION_PREFIX
 ARG RELEASE_TAG

Makefile

@@ -102,12 +102,12 @@ ait-install:
 .PHONY: envscript-install
 
 envscript-install: ait-install llvm-install xtasks-install
+	@echo "#!/bin/bash" >$(PREFIX_TARGET)/environment_ompss_2_fpga.sh
 	@echo "#!/bin/bash" >$(PREFIX_HOST)/environment_ompss_2_fpga.sh
+	@echo 'export PATH='$(PREFIX_TARGET)'/libxtasks/bin:$$PATH' >>$(PREFIX_TARGET)/environment_ompss_2_fpga.sh
 	@echo 'export PATH='$(PREFIX_HOST)'/llvm/bin:$$PATH' >>$(PREFIX_HOST)/environment_ompss_2_fpga.sh
 	@echo 'export PATH='$(PREFIX_HOST)'/ait/bin:$$PATH' >>$(PREFIX_HOST)/environment_ompss_2_fpga.sh
 	@echo 'export PYTHONPATH='$(PREFIX_HOST)'/ait' >>$(PREFIX_HOST)/environment_ompss_2_fpga.sh
-	@echo "#!/bin/bash" >$(PREFIX_TARGET)/environment_ompss_2_fpga.sh
-	@echo 'export PATH='$(PREFIX_TARGET)'/libxtasks/bin:$$PATH' >>$(PREFIX_TARGET)/environment_ompss_2_fpga.sh
 
 .PHONY: clean mrproper