Skip to content

Commit 3aa8de0

Browse files
committed
fill smbios menu after change variant
Signed-off-by: Slice <[email protected]>
1 parent d07a966 commit 3aa8de0

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

build_gcc14.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ set -u # exit with error if unbound variables
2727
# GCC toolchain source version
2828
# here we can change source versions of tools
2929
#
30-
export BINUTILS_VERSION=${BINUTILS_VERSION:-binutils-2.42} #2.42
31-
export GCC_VERSION=${GCC_VERSION:-14.1.0}
30+
export BINUTILS_VERSION=${BINUTILS_VERSION:-binutils-2.44} #2.42
31+
export GCC_VERSION=${GCC_VERSION:-14.2.0}
3232

3333
# Version of libraries are from ./contrib/download_prerequisites in gcc source directory
3434
export GMP_VERSION=${GMP_VERSION:-gmp-6.3.0} #6.2.1
35-
export MPFR_VERSION=${MPFR_VERSION:-mpfr-4.2.1}
35+
export MPFR_VERSION=${MPFR_VERSION:-mpfr-4.2.2}
3636
export MPC_VERSION=${MPC_VERSION:-mpc-1.3.1}
3737

3838
# isl-0.25 compatibility requirement is set to 10.14
@@ -419,7 +419,7 @@ GCC_native () {
419419
export LDFLAGS="-L$PREFIX/lib -L$PREFIX/sdk/lib -dead_strip -Wl,-dead_strip_dylibs"
420420

421421

422-
local cmd="${GCC_DIR}/configure --prefix='$PREFIX' --with-sysroot='$TOOLCHAIN_SDK_DIR' --enable-languages=c,c++ --libdir='$PREFIX/lib/gcc$GCC_MAJOR_VERSION' --includedir='$PREFIX/include/gcc$GCC_MAJOR_VERSION' --datarootdir='$PREFIX/share/gcc$GCC_MAJOR_VERSION' --with-included-gettext --with-system-zlib --disable-nls --enable-plugin --with-gxx-include-dir='$PREFIX/include/gcc$GCC_MAJOR_VERSION/c++/' --with-gmp='$PREFIX' --with-mpfr='$PREFIX' --with-mpc='$PREFIX' --with-isl='$PREFIX' --disable-bootstrap --disable-isl-version-check"
422+
local cmd="${GCC_DIR}/configure --prefix='$PREFIX' --with-sysroot='$TOOLCHAIN_SDK_DIR' --enable-languages=c,c++,ada --libdir='$PREFIX/lib/gcc$GCC_MAJOR_VERSION' --includedir='$PREFIX/include/gcc$GCC_MAJOR_VERSION' --datarootdir='$PREFIX/share/gcc$GCC_MAJOR_VERSION' --with-included-gettext --with-system-zlib --disable-nls --enable-plugin --with-gxx-include-dir='$PREFIX/include/gcc$GCC_MAJOR_VERSION/c++/' --with-gmp='$PREFIX' --with-mpfr='$PREFIX' --with-mpc='$PREFIX' --with-isl='$PREFIX' --disable-bootstrap --disable-isl-version-check"
423423
local logfile="$DIR_LOGS/gcc-native.$ARCH.configure.log.txt"
424424
echo "$cmd" > "$logfile"
425425
echo "- gcc-${GCC_VERSION} (native) configure..."

rEFIt_UEFI/Settings/ConfigManager.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,11 @@ void ConfigManager::ReloadSmbios(XStringW& str)
606606
break;
607607
}
608608
}
609-
FillSmbiosWithDefaultValue(GlobalConfig.CurrentModel, configPlist.getSMBIOS());
610-
DBG("SMBIOS reloaded with model %s\n", gSettings.Smbios.ProductName.c_str());
609+
// FillSmbiosWithDefaultValue(GlobalConfig.CurrentModel, configPlist.getSMBIOS());
610+
// DBG("SMBIOS reloaded with model %s\n", gSettings.Smbios.ProductName.c_str());
611611
}
612-
612+
FillSmbiosWithDefaultValue(GlobalConfig.CurrentModel, configPlist.getSMBIOS());
613+
DBG("SMBIOS reloaded with model %s\n", gSettings.Smbios.ProductName.c_str());
613614
}
614615

615616
void ConfigManager::FillSmbiosWithDefaultValue(MacModel Model, const SmbiosPlistClass::SmbiosDictClass& smbiosDictClass)

0 commit comments

Comments
 (0)