From b1a8fa1c7e4ebce74c6136a4435b78343959e4f6 Mon Sep 17 00:00:00 2001 From: Anthony Islas Date: Mon, 5 Aug 2024 18:42:43 -0700 Subject: [PATCH] Purge underscore defs from stanza reading --- arch/configure_reader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/configure_reader.py b/arch/configure_reader.py index c52d776af7..a72e4a7cf4 100755 --- a/arch/configure_reader.py +++ b/arch/configure_reader.py @@ -160,11 +160,14 @@ def sanitize( self ) : # # Now deref self.dereference( "FCBASEOPTS" ) + definesToRemove = [ "-DUNDERSCORE", "-DNOUNDERSCORE" ] + # Remove rogue compile commands that should *NOT* even be here for keyToSan in self.kvPairs_.keys() : self.kvPairs_[ keyToSan ] = configureRepl.sub( r"\1\2", self.kvPairs_[ keyToSan ] ).strip() self.kvPairs_[ keyToSan ] = compileObject.sub( r"\1\2", self.kvPairs_[ keyToSan ] ).strip() - + for cppDef in definesToRemove : + self.kvPairs_[ keyToSan ] = self.kvPairs_[ keyToSan ].replace( cppDef, "" ) # Now fix certain ones that are mixing programs with flags all mashed into one option self.splitIntoFieldAndFlags( "SFC" )