Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/zsh-completion/_dub
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ _dub_generate_generic() {
'(-c --config)'{-c,--config=}'[Builds the specified configuration]:package configuration: ' \
'*--override-config=[ Uses the specified configuration for a certain dependency]:dependency/config: ' \
'--compiler=[Specifies the compiler binary to use (can be a path)]:compiler:(dmd gdc ldc gdmd ldmd)' \
'(-a --arch)'{-a,--arch=}'[Force a different architecture (e.g. x86 or x86_64)]:architecture: ' \
'(-a --arch)'{-a,--arch=}'[Force a different architecture (e.g. x86, x86_64 or aarch64)]:architecture: ' \
'(-d --debug)*'{-d,--debug=}'[Define the specified debug version identifier when building]:Debug version: ' \
'--d-version=[Define the specified version identifier when building]:Version identifier: ' \
'--nodeps[Do not resolve missing dependencies before building]' \
Expand Down
6 changes: 3 additions & 3 deletions source/dub/commandline.d
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import dub.compilers.compiler;
import dub.dependency;
import dub.dub;
import dub.generators.generator;
import dub.internal.logging;
import dub.internal.utils : getClosestMatch, getDUBVersion, getTempFile;
import dub.internal.vibecompat.core.file;
import dub.internal.vibecompat.data.json;
import dub.internal.vibecompat.inet.path;
import dub.internal.logging;
import dub.package_;
import dub.packagemanager;
import dub.packagesuppliers;
import dub.project;
import dub.internal.utils : getDUBVersion, getClosestMatch, getTempFile;

import dub.internal.dyaml.stdsumtype;

Expand Down Expand Up @@ -1306,7 +1306,7 @@ abstract class PackageBuildCommand : Command {
" "~["dmd", "gdc", "ldc", "gdmd", "ldmd"].join(", ")
]);
args.getopt("a|arch", &m_arch, [
"Force a different architecture (e.g. x86 or x86_64)"
"Force a different architecture (e.g. x86, x86_64 or aarch64)"
]);
args.getopt("d|debug", &m_debugVersions, [
"Define the specified `debug` version identifier when building - can be used multiple times"
Expand Down
5 changes: 3 additions & 2 deletions source/dub/compilers/dmd.d
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ module dub.compilers.dmd;

import dub.compilers.compiler;
import dub.compilers.utils;
import dub.internal.logging;
import dub.internal.utils;
import dub.internal.vibecompat.core.file;
import dub.internal.vibecompat.inet.path;
import dub.internal.logging;

import std.algorithm;
import std.array;
Expand All @@ -23,7 +23,7 @@ import std.typecons;
version (Windows)
private Nullable!bool isWow64() {
// See also: https://docs.microsoft.com/de-de/windows/desktop/api/sysinfoapi/nf-sysinfoapi-getnativesysteminfo
import core.sys.windows.windows : GetNativeSystemInfo, SYSTEM_INFO, PROCESSOR_ARCHITECTURE_AMD64;
import core.sys.windows.windows : GetNativeSystemInfo, PROCESSOR_ARCHITECTURE_AMD64, SYSTEM_INFO;

static Nullable!bool result;

Expand Down Expand Up @@ -128,6 +128,7 @@ config /etc/dmd.conf
{
// Set basic arch flags for the probe - might be revised based on the exact value + compiler version
string[] arch_flags;
// keep the platform arguments below updated with dub-docs! (docs/dub-reference/platform_specifications.md)
switch (arch_override) {
default: throw new UnsupportedArchitectureException(arch_override);
case "":
Expand Down
3 changes: 2 additions & 1 deletion source/dub/compilers/gdc.d
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ module dub.compilers.gdc;

import dub.compilers.compiler;
import dub.compilers.utils;
import dub.internal.logging;
import dub.internal.utils;
import dub.internal.vibecompat.core.file;
import dub.internal.vibecompat.inet.path;
import dub.internal.logging;

import std.algorithm;
import std.array;
Expand Down Expand Up @@ -68,6 +68,7 @@ class GDCCompiler : Compiler {
BuildPlatform determinePlatform(ref BuildSettings settings, string compiler_binary, string arch_override)
{
string[] arch_flags;
// keep the platform arguments below updated with dub-docs! (docs/dub-reference/platform_specifications.md)
switch (arch_override) {
default: throw new UnsupportedArchitectureException(arch_override);
case "": break;
Expand Down
3 changes: 2 additions & 1 deletion source/dub/compilers/ldc.d
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ module dub.compilers.ldc;

import dub.compilers.compiler;
import dub.compilers.utils;
import dub.internal.logging;
import dub.internal.utils;
import dub.internal.vibecompat.core.file;
import dub.internal.vibecompat.inet.path;
import dub.internal.logging;

import std.algorithm;
import std.array;
Expand Down Expand Up @@ -80,6 +80,7 @@ config /etc/ldc2.conf (x86_64-pc-linux-gnu)
{
string[] arch_flags;
bool arch_override_is_triple = false;
// keep the platform arguments below updated with dub-docs! (docs/dub-reference/platform_specifications.md)
switch (arch_override) {
case "": break;
case "x86": arch_flags = ["-march=x86"]; break;
Expand Down