Skip to content

Commit 0645768

Browse files
committed
refactor(toolchain): 统一安装脚本中环境变量设置的格式和顺序
确保在system选项下,环境变量不会被额外写入setup中
1 parent a38b5e7 commit 0645768

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

toolchain/scripts/stage1/install_mpich.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ export LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
179179
export LD_RUN_PATH "${pkg_install_dir}/lib":\${LD_RUN_PATH}
180180
export LIBRARY_PATH "${pkg_install_dir}/lib":\${LIBRARY_PATH}
181181
export CPATH "${pkg_install_dir}/include":\${CPATH}
182-
183182
EOF
184183
fi
185184
cat "${BUILDDIR}/setup_mpich" >> ${SETUPFILE}

toolchain/scripts/stage3/install_elpa.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ export PKG_CONFIG_PATH="$pkg_install_dir/lib/pkgconfig":\${PKG_CONFIG_PATH}
262262
export CMAKE_PREFIX_PATH="$pkg_install_dir":\${CMAKE_PREFIX_PATH}
263263
export ELPA_ROOT="$pkg_install_dir"
264264
EOF
265+
cat "${BUILDDIR}/setup_elpa" >> $SETUPFILE
265266
fi
266-
cat "${BUILDDIR}/setup_elpa" >> $SETUPFILE
267267
cat << EOF >> "${BUILDDIR}/setup_elpa"
268268
export ELPA_CFLAGS="${ELPA_CFLAGS}"
269269
export ELPA_LDFLAGS="${ELPA_LDFLAGS}"

toolchain/scripts/stage3/install_fftw.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ export CPATH="$pkg_install_dir/include":\${CPATH}
141141
export PKG_CONFIG_PATH="$pkg_install_dir/lib/pkgconfig":\${PKG_CONFIG_PATH}
142142
export CMAKE_PREFIX_PATH="$pkg_install_dir":\${CMAKE_PREFIX_PATH}
143143
EOF
144-
fi
145-
# we may also want to cover FFT_SG
146-
cat << EOF >> "${BUILDDIR}/setup_fftw"
144+
fi
145+
# we may also want to cover FFT_SG
146+
cat << EOF >> "${BUILDDIR}/setup_fftw"
147147
export FFTW3_INCLUDES="${FFTW_CFLAGS}"
148148
export FFTW3_LIBS="${FFTW_LIBS}"
149149
export FFTW_CFLAGS="${FFTW_CFLAGS}"
@@ -156,7 +156,7 @@ export CP_LIBS="${FFTW_LIBS} \${CP_LIBS}"
156156
export FFTW_ROOT=${FFTW_ROOT:-${pkg_install_dir}}
157157
export FFTW3_ROOT=${pkg_install_dir}
158158
EOF
159-
cat "${BUILDDIR}/setup_fftw" >> $SETUPFILE
159+
cat "${BUILDDIR}/setup_fftw" >> $SETUPFILE
160160
fi
161161
cd "${ROOTDIR}"
162162

toolchain/scripts/stage3/install_libxc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ export CPATH="$pkg_install_dir/include":\${CPATH}
126126
export PKG_CONFIG_PATH="$pkg_install_dir/lib/pkgconfig":\${PKG_CONFIG_PATH}
127127
export CMAKE_PREFIX_PATH="$pkg_install_dir":\${CMAKE_PREFIX_PATH}
128128
EOF
129+
cat "${BUILDDIR}/setup_libxc" >> $SETUPFILE
129130
fi
130-
cat "${BUILDDIR}/setup_libxc" >> $SETUPFILE
131131
cat << EOF >> "${BUILDDIR}/setup_libxc"
132132
export LIBXC_CFLAGS="${LIBXC_CFLAGS}"
133133
export LIBXC_LDFLAGS="${LIBXC_LDFLAGS}"

0 commit comments

Comments
 (0)