Skip to content

Set BUILD_ENV via make variable instead of patching via sed #2383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 6, 2018

Conversation

tautschnig
Copy link
Collaborator

No description provided.

@chrisr-diffblue
Copy link
Contributor

Is setting BUILD_ENV even needed here? If I'm reading src/config.inc and src/common properly, then by default BUILD_ENV should be set to MSVC anyway (assuming that uname returns something that src/common recognises...)

I confess that I don't know what uname returns for a Win64 system so it may be some additional patching is required to src/common

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Passed Diffblue compatibility checks (cbmc commit: e00c6ee).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/76947100

@kroening
Copy link
Member

On Windows, there is a choice of two build systems: You can build with a MingW g++, or with Visual Studio. AUTO selects the MingW path right now, but practically we deliver binaries built with Visual Studio.

Perhaps the default should simply change to Visual Studio.

@tautschnig
Copy link
Collaborator Author

Perhaps the default should simply change to Visual Studio.

As far as I am aware there still is a customer using MinGW? I'd say this switch is something we could do for a 6.0 release, but we need to take note of it in the release notes. Also, I'd rather do this in a separate pull request. This PR really just changes our CI scripts, it has no customer impact.

@chrisr-diffblue
Copy link
Contributor

Re customers using WinGW - yes, there are customers out there using it (I've just returned from visiting one of them...)

@tautschnig tautschnig merged commit 9013779 into diffblue:develop Jul 6, 2018
@tautschnig tautschnig deleted the no-sed branch July 6, 2018 08:36
NathanJPhillips pushed a commit to NathanJPhillips/cbmc that referenced this pull request Aug 22, 2018
6409eae Merge pull request diffblue#2449 from tautschnig/c++-template-cleanup
1134455 Merge pull request diffblue#2443 from tautschnig/vs-rdecl
6e9e655 Merge pull request diffblue#2520 from smowton/smowton/feature/constant-propagator-selectivity
9013779 Merge pull request diffblue#2383 from tautschnig/no-sed
56a487e Constant propagator: add callback to filter tracked values
a354513 Merge pull request diffblue#2510 from polgreen/hex_trace
3545be4 Merge pull request diffblue#2523 from peterschrammel/do-not-ignore-full-slice
819c683 Merge pull request diffblue#2493 from jeannielynnmoulton/jeannie/InnerClasses
a018652 allow unsigned long instead of unsigned in regression test for hex_trace
d5bbdd8 represent numerical values in CBMC trace in hex
19bddce Do not ignore --full-slice
5350133 Refactor inner class parsing.
6e554d9 Merge pull request diffblue#2500 from diffblue/git-version-speedup
9ba55e2 Marks anonymous classes as inner classes
b96c7ba move build commands for version.h from common to util/
6ce7b13 Clarifies language in documentation.
c0c1029 Fixes parsing for anonymous classes
1930aef Refactors parsing of inner classes attribute.
b28562b Adds unit test for parsing inner classes.
c336455 Stores inner class data in java class types.
457bac9 Parses InnerClasses attribute of java bytecode.
34bd58f Clean up unused template instantiation symbols
fea1f47 Remove unused parameter from rDeclarator
e00c6ee Set BUILD_ENV via make variable instead of patching via sed

git-subtree-dir: cbmc
git-subtree-split: 6409eae
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants