Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add GCC_GNU_SHORT_TRIPLET for packages that use -solaris2 instead of -solaris2.11 #16200

Draft
wants to merge 1 commit into
base: oi/hipster
Choose a base branch
from
Draft

Add GCC_GNU_SHORT_TRIPLET for packages that use -solaris2 instead of -solaris2.11 #16200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion make-rules/ips.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ PKG_VARS += MACH MACH32 MACH64
PKG_VARS += BUILD_VERSION OS_VERSION PKG_SOLARIS_VERSION
PKG_VARS += GNU_TRIPLET
PKG_VARS += GCC_GNU_TRIPLET
PKG_VARS += GCC_GNU_SHORT_TRIPLET
PKG_VARS += CONSOLIDATION
PKG_VARS += COMPONENT_VERSION IPS_COMPONENT_VERSION HUMAN_VERSION
PKG_VARS += COMPONENT_ARCHIVE_URL COMPONENT_PROJECT_URL COMPONENT_NAME
Expand Down Expand Up @@ -326,7 +327,8 @@ $(GENERATED).p5m: install $(GENERATE_EXTRA_DEPS)
$(PKGMOGRIFY) $(PKG_OPTIONS) /dev/fd/0 $(GENERATE_TRANSFORMS) | \
$(GSED) -e '/^$$/d' -e '/^#.*$$/d' \
-e '/\.la$$/d' \
-e 's/$(subst .,\.,$(GCC_GNU_TRIPLET))/$$(GCC_GNU_TRIPLET)/g' | \
-e 's/$(subst .,\.,$(GCC_GNU_TRIPLET))/$$(GCC_GNU_TRIPLET)/g' \
-e 's/$(subst .,\.,$(GCC_GNU_SHORT_TRIPLET))/$$(GCC_GNU_SHORT_TRIPLET)/g' | \
$(PKGFMT) -u | \
uniq | \
$(PKGFMT) | \
Expand Down
2 changes: 2 additions & 0 deletions make-rules/shared-macros.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,8 @@ FC.gcc.64 = $(GCC_ROOT)/bin/gfortran
GCC_FULL_VERSION = $(shell $(GCC_ROOT)/bin/gcc -dumpversion)
# Since gcc-9 the GNU triplet is x86_64-pc-solaris2.11 instead of i386-pc-solaris2.11
GCC_GNU_TRIPLET = $(shell $(GCC_ROOT)/bin/gcc -dumpmachine)
# GCC triplet with shorter version ( ..-solaris2 rather than ..-solaris2.11)
GCC_GNU_SHORT_TRIPLET = $(shell $(GCC_ROOT)/bin/gcc -dumpmachine | /usr/bin/sed -E 's/\.[0-9]+$$//')
GCC_BINDIR = $(GCC_ROOT)/bin
GCC_LIBDIR.32 = $(GCC_ROOT)/lib
GCC_LIBDIR.64 = $(GCC_ROOT)/lib/$(MACH64)
Expand Down