diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-02-20 20:03:21 (EST) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-02-20 20:03:21 (EST) |
| commit | e5220b4c6834471bc085e002280f4c3b16e3b6e0 (patch) | |
| tree | c87c325fcac6436b0855ef7147aa8537e7316cd5 /src | |
| parent | 32505bcc85b03c5916ab8ffd8c64aeb3e846456b (diff) | |
Remove CPU vendor from architecture tuple.
Diffstat (limited to 'src')
| -rw-r--r-- | src/opkbuild | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opkbuild b/src/opkbuild index 2c0d3f0..22ea79d 100644 --- a/src/opkbuild +++ b/src/opkbuild @@ -121,7 +121,7 @@ fi # Attempt to detect the target architecture tuple. # NB: Currently cross-compiling is not supported. arch=$(opkg print-architecture | sed -n \ - 's/^arch \([^ -][^ -]*-[^ -][^ -]*-[^ -][^ -]*-[^ -][^ -]*\) [0-9][0-9]*$/\1/p') + 's/^arch \([^ -][^ -]*-[^ -][^ -]*-[^ -][^ -]*\) [0-9][0-9]*$/\1/p') if [ -z "${arch}" ]; then printf 'opkbuild: Error: No installable architecture found\n' >&2 elif [ $(echo "${arch}" | wc -l) -gt 1 ]; then @@ -141,10 +141,10 @@ version=$(oh_get_field Version) # Set environment variables for the build configuration. export OH_PLATFORM="${platform}" export OH_ARCH="${arch}" -IFS=- read OH_ARCH_CPU OH_ARCH_VENDOR OH_ARCH_KERNEL OH_ARCH_LIBS <<EOF +IFS=- read OH_ARCH_CPU OH_ARCH_KERNEL OH_ARCH_LIBS <<EOF ${OH_ARCH} EOF -export OH_ARCH_CPU OH_ARCH_VENDOR OH_ARCH_KERNEL OH_ARCH_LIBS +export OH_ARCH_CPU OH_ARCH_KERNEL OH_ARCH_LIBS export OH_SRCPKG="${srcpkg}" export OH_PKGVER=${version} |