diff --git a/arch/Linux-gnu-x86_64-static.ssmp b/arch/Linux-gnu-x86_64-static.ssmp index 3c876000e2..226c7a374a 100644 --- a/arch/Linux-gnu-x86_64-static.ssmp +++ b/arch/Linux-gnu-x86_64-static.ssmp @@ -117,16 +117,18 @@ ifneq ($(USE_LIBXC),) LIBS += $(LIBXC_LIB)/libxc.a endif -ifneq ($(USE_DFTD4),) - USE_DFTD4 := $(strip $(USE_DFTD4)) - DFTD4_INC := $(INSTALL_PATH)/dftd4-$(USE_DFTD4)/include - DFTD4_LIB := $(INSTALL_PATH)/dftd4-$(USE_DFTD4)/lib - CFLAGS += -I$(DFTD4_INC)/dftd4/GNU-$(GNU_VER) - DFLAGS += -D__DFTD4 - LIBS += $(DFTD4_LIB)/libdftd4.a - LIBS += $(DFTD4_LIB)/libmstore.a - LIBS += $(DFTD4_LIB)/libmulticharge.a - LIBS += $(DFTD4_LIB)/libmctc-lib.a +ifeq ($(USE_TBLITE),) + ifneq ($(USE_DFTD4),) + USE_DFTD4 := $(strip $(USE_DFTD4)) + DFTD4_INC := $(INSTALL_PATH)/dftd4-$(USE_DFTD4)/include + DFTD4_LIB := $(INSTALL_PATH)/dftd4-$(USE_DFTD4)/lib + CFLAGS += -I$(DFTD4_INC)/dftd4/GNU-$(GNU_VER) + DFLAGS += -D__DFTD4 + LIBS += $(DFTD4_LIB)/libdftd4.a + LIBS += $(DFTD4_LIB)/libmstore.a + LIBS += $(DFTD4_LIB)/libmulticharge.a + LIBS += $(DFTD4_LIB)/libmctc-lib.a + endif endif ifneq ($(USE_LIBGRPP),) diff --git a/arch/Linux-gnu-x86_64.psmp b/arch/Linux-gnu-x86_64.psmp index 325057e641..7153e6a142 100644 --- a/arch/Linux-gnu-x86_64.psmp +++ b/arch/Linux-gnu-x86_64.psmp @@ -198,20 +198,22 @@ ifneq ($(USE_LIBXC),) endif endif -ifneq ($(USE_DFTD4),) - USE_DFTD4 := $(strip $(USE_DFTD4)) - DFTD4_INC := $(INSTALL_PATH)/dftd4-$(USE_DFTD4)/include - DFTD4_LIB := $(INSTALL_PATH)/dftd4-$(USE_DFTD4)/lib - CFLAGS += -I$(DFTD4_INC)/dftd4/GNU-$(GNU_VER) - DFLAGS += -D__DFTD4 - ifeq ($(SHARED), yes) - LIBS += -Wl,-rpath=$(DFTD4_LIB) -L$(DFTD4_LIB) -ldftd4 -lmstore -lmulticharge -lmctc-lib - else - LIBS += $(DFTD4_LIB)/libdftd4.a - LIBS += $(DFTD4_LIB)/libmstore.a - LIBS += $(DFTD4_LIB)/libmulticharge.a - LIBS += $(DFTD4_LIB)/libmctc-lib.a - endif +ifeq ($(USE_TBLITE),) + ifneq ($(USE_DFTD4),) + USE_DFTD4 := $(strip $(USE_DFTD4)) + DFTD4_INC := $(INSTALL_PATH)/dftd4-$(USE_DFTD4)/include + DFTD4_LIB := $(INSTALL_PATH)/dftd4-$(USE_DFTD4)/lib + CFLAGS += -I$(DFTD4_INC)/dftd4/GNU-$(GNU_VER) + DFLAGS += -D__DFTD4 + ifeq ($(SHARED), yes) + LIBS += -Wl,-rpath=$(DFTD4_LIB) -L$(DFTD4_LIB) -ldftd4 -lmstore -lmulticharge -lmctc-lib + else + LIBS += $(DFTD4_LIB)/libdftd4.a + LIBS += $(DFTD4_LIB)/libmstore.a + LIBS += $(DFTD4_LIB)/libmulticharge.a + LIBS += $(DFTD4_LIB)/libmctc-lib.a + endif + endif endif ifneq ($(USE_LIBGRPP),) diff --git a/tools/toolchain/scripts/stage0/install_gcc.sh b/tools/toolchain/scripts/stage0/install_gcc.sh index b916acdf4e..b95099f696 100755 --- a/tools/toolchain/scripts/stage0/install_gcc.sh +++ b/tools/toolchain/scripts/stage0/install_gcc.sh @@ -6,8 +6,8 @@ [ "${BASH_SOURCE[0]}" ] && SCRIPT_NAME="${BASH_SOURCE[0]}" || SCRIPT_NAME=$0 SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_NAME")/.." && pwd -P)" -gcc_ver="14.2.0" -gcc_sha256="7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293" +gcc_ver="14.3.0" +gcc_sha256="ace8b8b0dbfe6abfc22f821cb093e195aa5498b7ccf7cd23e4424b9f14afed22" #gcc_ver="15.1.0" #gcc_sha256="51b9919ea69c980d7a381db95d4be27edf73b21254eb13d752a08003b4d013b1"