Skip to content

Commit

Permalink
makefile: pass BOOTFBCFLAGS to fbc when building bootstrap-dist
Browse files Browse the repository at this point in the history 
- BOOTFBCFLAGS should be set to pass extra flags to fbc when
  building the bootstrap source but otherwise have no effect on
  any other builds.
- We shouldn't break older sources by using defines only, since
  older sources won't know about the defines and they should be
  silently ignored.
- add FBSHA1 to BOOTFBCFLAGS to set fbc's SHA-1 version in the
  bootstrap sources

example:
  make bootstrap-dist FBSHA1=1 ...
  • Loading branch information
@jayrm
jayrm committed Dec 28, 2023
1 parent 66f9c8a commit dd59a4d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
2 changes: 2 additions & 0 deletions changelog.txt
View file
Expand Up @@ -5,6 +5,8 @@ Version 1.10.2
[added]
fbc: add FB_CPUTYPE_ARMV6_FP for -march=armv6+fp
fbc: add FB_CPUTYPE_ARMV7A_FP for -march=armv7-a+fp
makefile: pass BOOTFBCFLAGS to bootstrap-dist target when making source boostrap
makefile: add FBSHA1 to BOOTFBCFLAGS to allow setting fbc's sha-1 version in the bootstrap sources

[fixed]

Expand Down
32 changes: 17 additions & 15 deletions makefile
View file
Expand Up @@ -555,8 +555,10 @@ endif
ifdef FBSHA1
ifeq ($(FBSHA1),1)
ALLFBCFLAGS += -d 'FBSHA1="$(shell git rev-parse HEAD)"'
BOOTFBCFLAGS += -d 'FBSHA1="$(shell git rev-parse HEAD)"'
else
ALLFBCFLAGS += -d 'FBSHA1="$(FBSHA1)"'
BOOTFBCFLAGS += -d 'FBSHA1="$(FBSHA1)"'
endif
endif
ifdef ENABLE_SUFFIX
Expand Down Expand Up @@ -1336,21 +1338,21 @@ bootstrap-dist:
mkdir -p bootstrap/win64
mkdir -p bootstrap/linux-arm
mkdir -p bootstrap/linux-aarch64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target dos && mv src/compiler/*.asm bootstrap/dos
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-x86 && mv src/compiler/*.asm bootstrap/freebsd-x86
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-x86_64 && mv src/compiler/*.c bootstrap/freebsd-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-powerpc && mv src/compiler/*.c bootstrap/freebsd-powerpc
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-powerpc64 && mv src/compiler/*.c bootstrap/freebsd-powerpc64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-powerpc64le && mv src/compiler/*.c bootstrap/freebsd-powerpc64le
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target dragonfly-x86_64 && mv src/compiler/*.c bootstrap/dragonfly-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target solaris-x86_64 && mv src/compiler/*.c bootstrap/solaris-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-x86 && mv src/compiler/*.asm bootstrap/linux-x86
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-x86_64 && mv src/compiler/*.c bootstrap/linux-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target cygwin-x86_64 && mv src/compiler/*.c bootstrap/cygwin-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target win32 && mv src/compiler/*.asm bootstrap/win32
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target win64 && mv src/compiler/*.c bootstrap/win64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-arm && mv src/compiler/*.c bootstrap/linux-arm
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-aarch64 && mv src/compiler/*.c bootstrap/linux-aarch64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target dos && mv src/compiler/*.asm bootstrap/dos
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target freebsd-x86 && mv src/compiler/*.asm bootstrap/freebsd-x86
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target freebsd-x86_64 && mv src/compiler/*.c bootstrap/freebsd-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target freebsd-powerpc && mv src/compiler/*.c bootstrap/freebsd-powerpc
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target freebsd-powerpc64 && mv src/compiler/*.c bootstrap/freebsd-powerpc64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target freebsd-powerpc64le && mv src/compiler/*.c bootstrap/freebsd-powerpc64le
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target dragonfly-x86_64 && mv src/compiler/*.c bootstrap/dragonfly-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target solaris-x86_64 && mv src/compiler/*.c bootstrap/solaris-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target linux-x86 && mv src/compiler/*.asm bootstrap/linux-x86
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target linux-x86_64 && mv src/compiler/*.c bootstrap/linux-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target cygwin-x86_64 && mv src/compiler/*.c bootstrap/cygwin-x86_64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target win32 && mv src/compiler/*.asm bootstrap/win32
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target win64 && mv src/compiler/*.c bootstrap/win64
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target linux-arm && mv src/compiler/*.c bootstrap/linux-arm
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v $(BOOTFBCFLAGS) -target linux-aarch64 && mv src/compiler/*.c bootstrap/linux-aarch64

# Ensure to have LFs regardless of host system (LFs will probably work
# on DOS/Win32, but CRLFs could cause issues on Linux)
Expand Down

0 comments on commit dd59a4d

Please sign in to comment.