diff --git a/GNUmakefile b/GNUmakefile index daf28e7..3b0016b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,30 +1,30 @@ -IS_ = +TARGET = -ifeq ($(IS_),) - IS_ = $(shell uname -s) +ifeq ($(TARGET),) + TARGET = $(shell uname -s) endif ### Platforms -ifeq ($(IS_),Linux) - IS_ = 1 +ifeq ($(TARGET),Linux) + IS_UNIX = 1 endif -ifeq ($(IS_),NetBSD) - IS_ = 1 +ifeq ($(TARGET),NetBSD) + IS_UNIX = 1 endif -ifeq ($(IS_),Windows) - MINGW = 1 - IS_ = 1 +ifeq ($(TARGET),Windows) + IS_MINGW = 1 + IS_UNIX = 1 endif -ifeq ($(IS_),Watcom) - IS_ = 1 - IS_ = 1 +ifeq ($(TARGET),Watcom) + IS_WATCOM = 1 + IS_UNIX = 1 endif ### Stuff -ifeq ($(IS_),1) +ifeq ($(IS_UNIX),1) CC = gcc CFLAGS = -c LDFLAGS = @@ -33,11 +33,11 @@ ifeq ($(IS_),1) EXE = endif -ifeq ($(IS_),1) +ifeq ($(IS_WINDOWS),1) EXE = .exe endif -ifeq ($(IS_),1) +ifeq ($(IS_WATCOM),1) CC = owcc CFLAGS = -c LDFLAGS = @@ -48,13 +48,17 @@ ifeq ($(IS_),1) endif endif -ifeq ($(MINGW),1) +ifeq ($(IS_MINGW),1) CC = gcc CFLAGS = -c LDFLAGS = LIBS = endif +ifeq ($(IS_MUSL_CROSS),1) + CC = musl-$(CC) +endif + ### Common flags CFLAGS += -Iexternal/duktape -Iexternal/stb diff --git a/Jenkinsfile b/Jenkinsfile index 9dc6a7c..89b58be 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { } steps { sh("make clean") - sh("make -j4 ") + sh("make -j4 IS_MUSL_CROSS=1") sh("mv pmake pmake-linux64") archiveArtifacts("pmake-linux64") }