]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
make.sh: Don't export loads of variables in the main script
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Jul 2024 10:47:12 +0000 (10:47 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Jul 2024 15:39:44 +0000 (15:39 +0000)
We clear and reset the environment when we launch any build commands and
therefore don't need to do this here.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
make.sh

diff --git a/make.sh b/make.sh
index 9e4b870b53626dd3752c30825787edbe37b8423c..19d94445d5b9fdb5704a284ab79daa7b4912d259 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -44,6 +44,7 @@ ZSTD_OPT="-T0 --ultra -22"
 #
 ###############################################################################
 
+LC_ALL=POSIX
 PS1='\u:\w$ '
 
 # Remember if the shell is interactive or not
@@ -432,11 +433,6 @@ prepareenv() {
        # Set umask
        umask 022
 
-       # Setup environment
-       LC_ALL=POSIX
-       export LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS NINJAJOBS
-       unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
-
        # Make some extra directories
        mkdir -p "${CCACHE_DIR}"
        mkdir -p "${BUILD_DIR}/${TOOLS_DIR}"