mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

more dotnetcore preparation

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-10-22 12:15:54 -07:00
parent 4616ddf103
commit 540922766d
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/mk_util.py
View file

@ -1875,10 +1875,10 @@ class DotNetCoreDLLComponent(Component):
out.write(cs_file) out.write(cs_file)
out.write('\n') out.write('\n')
cscCmdLine = [DOTNET] dotnetCmdLine = [DOTNET]
if IS_WINDOWS: if IS_WINDOWS:
# Using these flags under the mono compiler results in build errors. # Using these flags under the mono compiler results in build errors.
cscCmdLine.extend( [# What is the motivation for this? dotnetCmdLine.extend( [# What is the motivation for this?
'/noconfig', '/noconfig',
'/nostdlib+', '/nostdlib+',
'/reference:mscorlib.dll', '/reference:mscorlib.dll',
@ -1903,9 +1903,9 @@ class DotNetCoreDLLComponent(Component):
print("%s.dll will be signed using key '%s'." % (self.dll_name, self.key_file)) print("%s.dll will be signed using key '%s'." % (self.dll_name, self.key_file))
if (self.key_file.find(' ') != -1): if (self.key_file.find(' ') != -1):
self.key_file = '"' + self.key_file + '"' self.key_file = '"' + self.key_file + '"'
cscCmdLine.append('/keyfile:{}'.format(self.key_file)) dotnetCmdLine.append('/keyfile:{}'.format(self.key_file))
cscCmdLine.extend( ['/unsafe+', dotnetCmdLine.extend( ['/unsafe+',
'/nowarn:1701,1702', '/nowarn:1701,1702',
'/errorreport:prompt', '/errorreport:prompt',
'/warn:4', '/warn:4',
@ -1919,22 +1919,22 @@ class DotNetCoreDLLComponent(Component):
] ]
) )
if DEBUG_MODE: if DEBUG_MODE:
cscCmdLine.extend( ['"/define:DEBUG;TRACE"', # Needs to be quoted due to ``;`` being a shell command separator dotnetCmdLine.extend( ['"/define:DEBUG;TRACE"', # Needs to be quoted due to ``;`` being a shell command separator
'/debug+', '/debug+',
'/debug:full', '/debug:full',
'/optimize-' '/optimize-'
] ]
) )
else: else:
cscCmdLine.extend(['/optimize+']) dotnetCmdLine.extend(['/optimize+'])
if IS_WINDOWS: if IS_WINDOWS:
if VS_X64: if VS_X64:
cscCmdLine.extend(['/platform:x64']) dotnetCmdLine.extend(['/platform:x64'])
elif VS_ARM: elif VS_ARM:
cscCmdLine.extend(['/platform:arm']) dotnetCmdLine.extend(['/platform:arm'])
else: else:
cscCmdLine.extend(['/platform:x86']) dotnetCmdLine.extend(['/platform:x86'])
else: else:
# Just use default platform for now. # Just use default platform for now.
# If the dlls are run using mono then it # If the dlls are run using mono then it
@ -1942,10 +1942,10 @@ class DotNetCoreDLLComponent(Component):
pass pass
for cs_file in cs_files: for cs_file in cs_files:
cscCmdLine.append('{}'.format(os.path.join(self.to_src_dir, cs_file))) dotnetCmdLine.append('{}'.format(os.path.join(self.to_src_dir, cs_file)))
# Now emit the command line # Now emit the command line
MakeRuleCmd.write_cmd(out, ' '.join(cscCmdLine)) MakeRuleCmd.write_cmd(out, ' '.join(dotnetCmdLine))
# State that the high-level "dotnet" target depends on the .NET bindings # State that the high-level "dotnet" target depends on the .NET bindings
# dll we just created the build rule for # dll we just created the build rule for