diff options
| author | ruki <[email protected]> | 2022-10-24 23:15:53 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-10-24 13:36:00 +0800 |
| commit | 57a2967cbac9338b412d9bb883191d1c6f756e03 (patch) | |
| tree | b6e3dac50aa790742f259516c698508828a797d0 | |
| parent | 7cf5b563927bc79748969d26e84d16884bbe4d73 (diff) | |
improve openbsd for arch
| -rw-r--r-- | .github/workflows/openbsd.yml | 2 | ||||
| -rw-r--r-- | core/makefile | 2 | ||||
| -rw-r--r-- | makefile | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/openbsd.yml b/.github/workflows/openbsd.yml index a064de185..c86a794c3 100644 --- a/.github/workflows/openbsd.yml +++ b/.github/workflows/openbsd.yml @@ -27,7 +27,7 @@ jobs: copyback: false prepare: pkg_add curl unzip gmake llvm gsed bash perl5 run: | - gmake -j4 BUILD_ARCH=x86_64 + gmake -j4 gmake install export XMAKE_ROOT=y xrepo --version diff --git a/core/makefile b/core/makefile index 297c497e6..c7771307c 100644 --- a/core/makefile +++ b/core/makefile @@ -158,12 +158,14 @@ BUILD_ARCH :=$(if $(findstring msys,$(PLAT)),$(MSYSARCH),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring cygwin,$(PLAT)),x$(shell getconf LONG_BIT),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring macosx,$(PLAT)),$(shell uname -m),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring linux,$(PLAT)),$(shell uname -m),$(BUILD_ARCH)) +BUILD_ARCH :=$(if $(findstring bsd,$(PLAT)),$(shell uname -m),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring bsd,$(PLAT)),x$(shell getconf LONG_BIT),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring iphoneos,$(PLAT)),arm64,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring i686,$(BUILD_ARCH)),i386,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring x32,$(BUILD_ARCH)),i386,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring x64,$(BUILD_ARCH)),x86_64,$(BUILD_ARCH)) +BUILD_ARCH :=$(if $(findstring amd64,$(BUILD_ARCH)),x86_64,$(BUILD_ARCH)) # on termux/ci ifneq ($(TERMUX_ARCH),) @@ -50,12 +50,14 @@ BUILD_ARCH :=$(if $(findstring msys,$(PLAT)),$(MSYSARCH),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring cygwin,$(PLAT)),x$(shell getconf LONG_BIT),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring macosx,$(PLAT)),$(shell uname -m),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring linux,$(PLAT)),$(shell uname -m),$(BUILD_ARCH)) +BUILD_ARCH :=$(if $(findstring bsd,$(PLAT)),$(shell uname -m),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring bsd,$(PLAT)),x$(shell getconf LONG_BIT),$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring iphoneos,$(PLAT)),arm64,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring android,$(PLAT)),armv7,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring i686,$(BUILD_ARCH)),i386,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring x32,$(BUILD_ARCH)),i386,$(BUILD_ARCH)) BUILD_ARCH :=$(if $(findstring x64,$(BUILD_ARCH)),x86_64,$(BUILD_ARCH)) +BUILD_ARCH :=$(if $(findstring amd64,$(BUILD_ARCH)),x86_64,$(BUILD_ARCH)) # on termux/ci ifneq ($(TERMUX_ARCH),) |