Răsfoiți Sursa

Update x86_64-alpine target

JDierkse 10 luni în urmă
părinte
comite
ea00112f40
1 a modificat fișierele cu 15 adăugiri și 8 ștergeri
  1. 15 8
      Makefile.conf.x86_64-alpine

+ 15 - 8
Makefile.conf.x86_64-alpine

@@ -6,14 +6,21 @@ ARCH := x86_64-alpine
 
 ARCHBASEDIR := $(BUILDSUPPORTDIR)/alpine
 
-AR := $(ARCHBASEDIR)/bin/x86_64-linux-musl-ar
-CC := $(ARCHBASEDIR)/bin/x86_64-linux-musl-g++
-STRIP := $(ARCHBASEDIR)/bin/x86_64-linux-musl-strip
-OBJCOPY := $(ARCHBASEDIR)/bin/x86_64-linux-musl-objcopy
+MUSL_TARGET := x86_64-unknown-linux-musl
+GCC_VERSION := 14.2.0
+MUSL_FOLDER := $(ARCHBASEDIR)/$(MUSL_TARGET)_$(GCC_VERSION)
 
-CFLAGS += -I$(ARCHBASEDIR)/include -I$(ARCHBASEDIR)/x86_64-linux-musl/include
-LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/x86_64-linux-musl/lib -L$(ARCHBASEDIR)/x86_64-linux-musl/usr/lib
-LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/x86_64-linux-musl/lib -Wl,-rpath,$(ARCHBASEDIR)/x86_64-linux-musl/usr/lib
+ALPINE_VERSION := 3.21
+ALPINE_FOLDER := $(ARCHBASEDIR)/x86_64-linux-musl_v$(ALPINE_VERSION)
 
-CFLAGS += -pedantic -Wno-stringop-truncation
+AR := $(MUSL_FOLDER)/bin/$(MUSL_TARGET)-ar
+CC := $(MUSL_FOLDER)/bin/$(MUSL_TARGET)-g++
+STRIP := $(MUSL_FOLDER)/bin/$(MUSL_TARGET)-strip
+OBJCOPY := $(MUSL_FOLDER)/bin/$(MUSL_TARGET)-objcopy
+
+CFLAGS += -I$(ALPINE_FOLDER)/usr/include
+LFLAGS += -L$(ALPINE_FOLDER)/lib -L$(ALPINE_FOLDER)/usr/lib
+LFLAGS += -Wl,-rpath,$(ALPINE_FOLDER)/lib -Wl,-rpath-link,$(ALPINE_FOLDER)/usr/lib
+
+CFLAGS += -Wno-stringop-truncation