cambridgehackers / connectal

Connectal is a framework for software-driven hardware development.
MIT License
159 stars 46 forks source link

fix obsolete bsc version bug #192

Closed pwang7 closed 1 year ago

pwang7 commented 1 year ago

fix the bug of the obsolete bsc version ifeq statement in Makefile.connectal.build

jameyhicks commented 1 year ago

Which version of Bluespec are you using?

pwang7 commented 1 year ago

Which version of Bluespec are you using?

I'm using the latest version:

Bluespec Compiler, version 2022.01 (build 066c7a8) This is free software; for source code and copying conditions, see https://github.com/B-Lang-org/bsc

Invoking command line: bsc -v

jameyhicks commented 1 year ago

I'm pretty sure it should be: else ifeq ($(shell test $(BSCMAJOR) -le 2019 &>/dev/null && echo obsolete),) BSIM_LIBRARY_DIR = $(BLUESPECDIR)/Bluesim/g++4_64 CXXFLAGS_BSIM += -DBSC_OBSOLETE else BSIM_LIBRARY_DIR = $(BLUESPECDIR)/Bluesim endif

pwang7 commented 1 year ago

I'm pretty sure it should be:

else ifeq ($(shell test $(BSCMAJOR) -le 2019 &>/dev/null && echo obsolete),) 
BSIM_LIBRARY_DIR = $(BLUESPECDIR)/Bluesim/g++4_64
CXXFLAGS_BSIM += -DBSC_OBSOLETE
else
BSIM_LIBRARY_DIR = $(BLUESPECDIR)/Bluesim endif

Yes, your reply is correct, and that's exactly my PR. The original Makefile.connectal.build is wrong: https://github.com/cambridgehackers/connectal/blob/master/scripts/Makefile.connectal.build#L76-L81

pwang7 commented 1 year ago

I'm pretty sure it should be:

else ifeq ($(shell test $(BSCMAJOR) -le 2019 &>/dev/null && echo obsolete),)
BSIM_LIBRARY_DIR = $(BLUESPECDIR)/Bluesim/g++4_64
CXXFLAGS_BSIM += -DBSC_OBSOLETE
else
BSIM_LIBRARY_DIR = $(BLUESPECDIR)/Bluesim endif

Your above reply is correct, my PR is exactly the same as your reply, but the original Makefile.connectal.build is wrong: https://github.com/cambridgehackers/connectal/blob/master/scripts/Makefile.connectal.build#L76-L81

else ifeq ($(shell test $(BSCMAJOR) -le 2019 &>/dev/null && echo obsolete),)
BSIM_LIBRARY_DIR = $(BLUESPECDIR)/Bluesim
else
BSIM_LIBRARY_DIR = $(BLUESPECDIR)/Bluesim/g++4_64
CXXFLAGS_BSIM += -DBSC_OBSOLETE
pwang7 commented 1 year ago

Thank you for fixing this.

You're welcome! Connectal is very good, I like it~