Skip to content

Commit

Permalink
Update BSC to compile with GHC 9.10.1
Browse files Browse the repository at this point in the history
The only change is to an invocation of GHC used to compile Htcl, to
use -optc-D instead of -D, since not all versions of GHC pass -D
options to the C compiler.
  • Loading branch information
quark17 committed May 31, 2024
1 parent e6f95a7 commit 80d9f7a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/comp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ GHCPATCH=$(shell echo $(GHCVERSION) | cut -d. -f3)
ifeq ($(GHCMAJOR),9)

# Warn about newer versions that are not yet supported
GHCMINORGT8 := $(shell expr $(GHCMINOR) \> 8)
ifeq ($(GHCMINORGT8),1)
GHCMINORGT10 := $(shell expr $(GHCMINOR) \> 10)
ifeq ($(GHCMINORGT10),1)
$(warning Unsupported GHC 9 minor version: $(GHCMINOR))
endif

Expand Down
4 changes: 3 additions & 1 deletion src/vendor/htcl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ include $(TOP)/platform.mk

TCLVER=$(shell echo 'catch { puts [info tclversion]; exit 0}; exit 1' | $(TCLSH))
ifeq ($(TCLVER),8.5)
GHCFLAGS += -DTCL85
# Use -optc-D instead of -D, since not all versions of GHC pass -D to the C compiler
# (see GHC issue 24885)
GHCFLAGS += -optc-DTCL85
else
ifeq ($(TCLVER),8.6)
# No flags needed
Expand Down

0 comments on commit 80d9f7a

Please sign in to comment.