Skip to content

Commit

Permalink
reenable incbin on 64-bit platforms (#4988)
Browse files Browse the repository at this point in the history
turns out we're still making releases for 32-bit platforms 😲
  • Loading branch information
arnetheduck authored May 24, 2023
1 parent f904206 commit 74b670a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions beacon_chain/networking/network_metadata.nim
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ export
const
vendorDir = currentSourcePath.parentDir.replace('\\', '/') & "/../../vendor"

# TODO: Currently, this breaks the Linux/ARM packaging due
# to a toolchain incompatibility problem
incbinEnabled* = false
incbinEnabled* = sizeof(pointer) == 8

type
Eth1BlockHash* = ethtypes.BlockHash
Expand Down Expand Up @@ -174,10 +172,7 @@ proc loadEth2NetworkMetadata*(
readBootEnr(bootEnrPath))

genesisData = if loadGenesis and fileExists(genesisPath):
when incbinEnabled:
toBytes readFile(genesisPath)
else:
readFile(genesisPath)
readFile(genesisPath)
else:
""

Expand All @@ -193,7 +188,9 @@ proc loadEth2NetworkMetadata*(
bootstrapNodes: bootstrapNodes,
depositContractBlock: depositContractBlock,
depositContractBlockHash: depositContractBlockHash,
genesisData: genesisData,
genesisData:
when incbinEnabled: toBytes genesisData
else: genesisData,
genesisDepositsSnapshot: genesisDepositsSnapshot)

except PresetIncompatibleError as err:
Expand Down

0 comments on commit 74b670a

Please sign in to comment.