Skip to content

Commit

Permalink
Merge pull request #7810 from jacob-carlborg/issue-18335-D_ObjectiveC…
Browse files Browse the repository at this point in the history
…-verbose

Fix issue 18335 - The D_ObjectiveC version identifier is not printed in verbose mode
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>
  • Loading branch information
dlang-bot committed Jan 31, 2018
2 parents c048abb + dc7a44c commit 7fa0306
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/dmd/mars.d
Expand Up @@ -479,6 +479,8 @@ private int tryMain(size_t argc, const(char)** argv)
Objc._init();
builtin_init();

printPredefinedVersions();

if (global.params.verbose)
{
fprintf(global.stdmsg, "binary %s\n", global.params.argv0);
Expand Down Expand Up @@ -1348,8 +1350,6 @@ void addDefaultVersionIdentifiers()
VersionCondition.addPredefinedGlobalIdent("D_BetterC");

VersionCondition.addPredefinedGlobalIdent("D_HardFloat");

printPredefinedVersions();
}

private void printPredefinedVersions()
Expand Down
10 changes: 10 additions & 0 deletions test/runnable/test18335.sh
@@ -0,0 +1,10 @@
#!/usr/bin/env bash

output_file="${RESULTS_DIR}/runnable/$(basename $0 .sh)"
set -ueo pipefail

if [ "${OS}" == "osx" ] && [ "${MODEL}" == "64" ]; then
echo "void main(){}" | "${DMD}" -o- -v - | grep predefs | grep -q "D_ObjectiveC"
fi

echo Success > "${output_file}"

0 comments on commit 7fa0306

Please sign in to comment.