Forráskód Böngészése

pass mic-build environment variables to mic build stages too, configure doesn't propagate all of them (not C_INCLUDE_PATH, notably)

Samuel Thibault 8 éve
szülő
commit
5c654acd27
1 módosított fájl, 13 hozzáadás és 0 törlés
  1. 13 0
      mic-configure

+ 13 - 0
mic-configure

@@ -171,6 +171,13 @@ do
 		CPLUS_INCLUDE_PATH=$SINK_CPLUS_INCLUDE_PATH \
 		PKG_CONFIG_PATH=$SINK_PKG_CONFIG_PATH \
 		$command "$@" "${params[@]}" "${mic_params[@]}"
+		MIC_BUILD_ENV="\
+LIBRARY_PATH=$SINK_LIBRARY_PATH \\
+	INCLUDE=$SINK_INCLUDE \\
+	C_INCLUDE_PATH=$SINK_C_INCLUDE_PATH \\
+	CPLUS_INCLUDE_PATH=$SINK_CPLUS_INCLUDE_PATH \\
+	PKG_CONFIG_PATH=$SINK_PKG_CONFIG_PATH \\\
+"
 	else
 		$command "$@" "${params[@]}""${host_params[@]}"
 	fi
@@ -184,6 +191,7 @@ if [ "$native_mic" -eq "1" ]
 then
 cat > Makefile << EOF
 all:
+	$MIC_BUILD_ENV
 	\$(MAKE) -C build_mic
 
 clean:
@@ -193,12 +201,14 @@ distclean: clean
 	rm -f Makefile
 
 check:
+	$MIC_BUILD_ENV
 	\$(MAKE) -C build_mic check
 
 showcheck:
 	\$(MAKE) -C build_mic showcheck
 
 install:
+	$MIC_BUILD_ENV
 	\$(MAKE) -C build_mic install
 	ln -sf "${prefix}/mic/lib/pkgconfig/starpu-1.3.pc" "${prefix}/mic/lib/pkgconfig/starpu-1.3-mic.pc"
 EOF
@@ -206,6 +216,7 @@ else
 cat > Makefile << EOF
 all:
 	\$(MAKE) -C build_host
+	$MIC_BUILD_ENV
 	\$(MAKE) -C build_mic
 
 clean:
@@ -217,6 +228,7 @@ distclean: clean
 
 check:
 	\$(MAKE) -C build_host check
+	$MIC_BUILD_ENV
 	\$(MAKE) -C build_mic check ; \
 	RET=\$\$? ; \
 	STARPU_NCPUS=0 \$(MAKE) -C build_mic check && [ \$\$RET == 0 ]
@@ -227,6 +239,7 @@ showcheck:
 
 install:
 	\$(MAKE) -C build_host install
+	$MIC_BUILD_ENV
 	\$(MAKE) -C build_mic install
 	ln -sf "${prefix}/mic/lib/pkgconfig/starpu-1.3.pc" "${prefix}/mic/lib/pkgconfig/starpu-1.3-mic.pc"
 EOF