diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-04-30 15:48:18 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-04-30 15:48:18 -0500 |
| commit | 04c684efff1498f99f7757324567e2a01d1a0d52 (patch) | |
| tree | 92f1c87e361a0c56df36de93fe84f314b143ccf7 | |
| parent | 34458ce9099bd5e38b83b1d437391476f3acb109 (diff) | |
| download | aura-central-04c684efff1498f99f7757324567e2a01d1a0d52.tar.gz | |
[System:Packager] Don't pretty up PKG_BUILD_TARGET
| -rw-r--r-- | system/packager/base.mk | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/system/packager/base.mk b/system/packager/base.mk index 3a3f8d76a..b9526faa9 100644 --- a/system/packager/base.mk +++ b/system/packager/base.mk @@ -177,22 +177,10 @@ endif # --------------------------------------------------------------------------------------------------------------------- -# TARGET_OS/TARGET_CPU may be un-intuitive, so we hardcode some special formats +# The Mozilla default is $(TARGET_OS)-$(TARGET_CPU) but also prettifies it for windows and linux. BinOC wants it to +# match the XPCOM info. ifndef PKG_BUILD_TARGET -PKG_BUILD_TARGET := $(TARGET_OS)-$(TARGET_CPU) -ifeq ($(OS_ARCH),WINNT) -ifeq ($(TARGET_CPU),x86_64) -PKG_BUILD_TARGET := win64 -else -PKG_BUILD_TARGET := win32 -endif -endif -ifeq ($(TARGET_OS),linux-gnu) -PKG_BUILD_TARGET := linux-$(TARGET_CPU) -endif -ifeq ($(OS_ARCH),SunOS) -PKG_BUILD_TARGET := sunos-$(TARGET_CPU) -endif +PKG_BUILD_TARGET := $(OS_TARGET)-$(TARGET_XPCOM_ABI) endif # PKG_BUILD_TARGET # --------------------------------------------------------------------------------------------------------------------- |