Change the method of passing configure args

Instead of "serialize" the arguments , this commit uses by-reference argument passing (Bash 5.3+). We now can pass array as-is so we later can enumerate them, select C|CXX|LDFLAGS from them, and made them as environment variable. As as result, now we can correctly run the configure scripts who doesn't support list FOO=bar as argument (like termcap).
guyutongxue · May 8, 2024 · 977ca57 · 977ca57
1 parent d4f30d4
commit 977ca57
Show file tree

Hide file tree

Showing 104 changed files with 430 additions and 407 deletions.
diff --git a/build b/build
@@ -857,11 +857,14 @@ for rule in ${SUBTARGETS[@]}; do
 
 		func_dbg_hook $sub "configure"
 		[[ ${#PKG_CONFIGURE_FLAGS[@]} >0 ]] && {
-			configure_flags="${PKG_CONFIGURE_FLAGS[@]}"
+			declare -a configure_flags=()
+			for flag in "${PKG_CONFIGURE_FLAGS[@]}"; do
+				configure_flags+=("$flag")
+			done
 			func_configure \
 				$PKG_NAME \
 				$PKG_DIR_NAME \
-				"$configure_flags" \
+				"configure_flags" \
 				$CONFIGURE_LOG \
 				$CURR_BUILD_DIR \
 				$PKG_LNDIR \

diff --git a/library/functions.sh b/library/functions.sh
@@ -687,6 +687,26 @@ function func_configure {
 	}
 
 	[[ ! -f $_marker ]] && {
+		local -n args="$3"
+		local -a non_flag_args=()
+		unset CFLAGS
+		unset CXXFLAGS
+		unset CPPFLAGS
+		unset LDFLAGS
+		for item in "${args[@]}"; do
+			# echo $item
+			if [[ $item == "CFLAGS="* ]]; then
+				export CFLAGS=${item#*=}
+			elif [[ $item == "CXXFLAGS="* ]]; then
+				export CXXFLAGS=${item#*=}
+			elif [[ $item == "CPPFLAGS="* ]]; then
+				export CPPFLAGS=${item#*=}
+			elif [[ $item == "LDFLAGS="* ]]; then
+				export LDFLAGS=${item#*=}
+			else
+				non_flag_args+=("$item")
+			fi
+		done
 		#echo "CFLAGS=\"$CFLAGS\", CXXFLAGS=\"$CXXFLAGS\", CPPFLAGS=\"$CPPFLAGS\", LDFLAGS=\"$LDFLAGS\""
 		#echo "ARGS=\"${3}\""
 		echo -n "--> configure..."
@@ -696,7 +716,7 @@ function func_configure {
 		} || {
 			local _rel_dir=$( func_absolute_to_relative $5/$_subbuilddir $SRCS_DIR/$_subsrcdir )
 		}
-		eval $PKG_CONFIGURE_PROG $_rel_dir/$PKG_CONFIGURE_SCRIPT "${3}" > $4 2>&1
+		eval $PKG_CONFIGURE_PROG $_rel_dir/$PKG_CONFIGURE_SCRIPT "${non_flag_args[@]}" > $4 2>&1
 		_result=$?
 		popd > /dev/null
 		[[ $_result == 0 ]] && {

diff --git a/scripts/binutils.sh b/scripts/binutils.sh
@@ -105,10 +105,10 @@ PKG_CONFIGURE_FLAGS=(
 		|| echo "$LINK_TYPE_STATIC"
 	)
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 )
 
 #

diff --git a/scripts/bzip2.sh b/scripts/bzip2.sh
@@ -73,10 +73,10 @@ PKG_CONFIGURE_FLAGS=(
 	#
 	$LINK_TYPE_SHARED
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS"
 )
 
 #

diff --git a/scripts/cloog.sh b/scripts/cloog.sh
@@ -72,10 +72,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-isl=system
 	--with-isl-prefix=$PREREQ_DIR/$HOST-$LINK_TYPE_SUFFIX
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS"
 )
 
 #

diff --git a/scripts/expat.sh b/scripts/expat.sh
@@ -35,7 +35,7 @@
 
 # **************************************************************************
 
-PKG_VERSION=2.5.0
+PKG_VERSION=2.6.2
 PKG_NAME=expat-${PKG_VERSION}
 PKG_DIR_NAME=expat-${PKG_VERSION}
 PKG_TYPE=.tar.xz
@@ -61,10 +61,10 @@ PKG_CONFIGURE_FLAGS=(
 	#
 	$LINK_TYPE_STATIC
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS"
 )
 
 #

diff --git a/scripts/gcc-10-branch.sh b/scripts/gcc-10-branch.sh
@@ -137,10 +137,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-10.1.0.sh b/scripts/gcc-10.1.0.sh
@@ -130,10 +130,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-10.2.0.sh b/scripts/gcc-10.2.0.sh
@@ -131,10 +131,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-10.3.0.sh b/scripts/gcc-10.3.0.sh
@@ -131,10 +131,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-10.4.0.sh b/scripts/gcc-10.4.0.sh
@@ -136,10 +136,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-10.5.0.sh b/scripts/gcc-10.5.0.sh
@@ -137,10 +137,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-11-branch.sh b/scripts/gcc-11-branch.sh
@@ -131,10 +131,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-11.1.0.sh b/scripts/gcc-11.1.0.sh
@@ -131,10 +131,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-11.2.0.sh b/scripts/gcc-11.2.0.sh
@@ -132,10 +132,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )

diff --git a/scripts/gcc-11.3.0.sh b/scripts/gcc-11.3.0.sh
@@ -126,10 +126,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )

diff --git a/scripts/gcc-11.4.0.sh b/scripts/gcc-11.4.0.sh
@@ -127,10 +127,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )

diff --git a/scripts/gcc-12-branch.sh b/scripts/gcc-12-branch.sh
@@ -136,10 +136,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 )
 

diff --git a/scripts/gcc-12.1.0.sh b/scripts/gcc-12.1.0.sh
@@ -126,10 +126,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )

diff --git a/scripts/gcc-12.2.0.sh b/scripts/gcc-12.2.0.sh
@@ -135,10 +135,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )

diff --git a/scripts/gcc-12.3.0.sh b/scripts/gcc-12.3.0.sh
@@ -136,10 +136,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )

diff --git a/scripts/gcc-13-branch.sh b/scripts/gcc-13-branch.sh
@@ -135,10 +135,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )

diff --git a/scripts/gcc-13.1.0.sh b/scripts/gcc-13.1.0.sh
@@ -135,10 +135,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )

diff --git a/scripts/gcc-13.2.0.sh b/scripts/gcc-13.2.0.sh
@@ -135,10 +135,10 @@ PKG_CONFIGURE_FLAGS=(
 	--with-pkgversion="\"$BUILD_ARCHITECTURE-$THREADS_MODEL-$EXCEPTIONS_MODEL${REV_STRING}, $MINGW_W64_PKG_STRING\""
 	--with-bugurl=$BUG_URL
 	#
-	CFLAGS="\"$COMMON_CFLAGS\""
-	CXXFLAGS="\"$COMMON_CXXFLAGS\""
-	CPPFLAGS="\"$COMMON_CPPFLAGS\""
-	LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
+	CFLAGS="$COMMON_CFLAGS"
+	CXXFLAGS="$COMMON_CXXFLAGS"
+	CPPFLAGS="$COMMON_CPPFLAGS"
+	LDFLAGS="$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )"
 	LD_FOR_TARGET=$PREFIX/bin/ld.exe
 	--with-boot-ldflags="\"$LDFLAGS -Wl,--disable-dynamicbase -static-libstdc++ -static-libgcc\""
 )