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

RedHat multi-platform build fixes #3169

Merged
merged 2 commits into from
Nov 20, 2024
Merged

RedHat multi-platform build fixes #3169

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a829063
Redhel multi-platform build fixes
pepone Nov 20, 2024
430cd91
Add comment regarding x86-64-v2 targets
pepone Nov 20, 2024
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
14 changes: 10 additions & 4 deletions config/Make.rules.Linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,25 @@ else ifneq ($(and $(filter centos rhel fedora,$(linux_id)),$(filter x86_64 i%86,
supported-platforms = x64 x86
multilib-platform = yes

# We filter out -m32, -m64, because Slice compilers are always build as 64bit executables, and we set
# the correct value for each arch build below. We also filter out -march setting to ensure our x86 builds
# target x86-64 capable processor.

ifeq ($(OPTIMIZE),yes)
# Use default system packaging flags if building with OPTIMIZE and CXXFLAGS/LDFLAGS aren't defined.
# NOTE: We remove the -m32/-m64 flags since we'll add them below.
opt-cppflags = $(if $(CXXFLAGS),,$(filter-out -m32 -m64,$(shell setarch $1 rpm --eval %optflags)))
opt-cppflags = $(if $(CXXFLAGS),,$(filter-out -m32 -m64 -march=%,$(shell setarch $1 rpm --eval %optflags)))
opt-ldflags = $(if $(LDFLAGS),,$(shell setarch $1 rpm --eval %?__global_ldflags))
endif

x64_cppflags := $(call opt-cppflags,x86_64) -m64
CXXFLAGS := $(filter-out -m32 -m64 -march=%, $(CXXFLAGS))
LDFLAGS := $(filter-out -m32 -m64, $(LDFLAGS))

x64_cppflags := $(call opt-cppflags,x86_64) -m64 -march=x86-64-v2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use x86-64?

x64_ldflags := $(call opt-ldflags,x86_64) -m64
x64_targetdir = $(if $(filter %/build,$5),/x64,$(if $(filter-out $($1_target),program),64))
x64_installdir = $(if $(and $(filter-out $($1_target),program),$(if $5,$(filter-out %64,$5),true)),64)

x86_cppflags := $(call opt-cppflags,i386) -m32
x86_cppflags := $(call opt-cppflags,i386) -m32 -march=x86-64-v2
x86_ldflags := $(call opt-ldflags,i386) -m32
x86_targetdir = $(if $(filter %/build,$5),/x86)
x86_targetname = $(if $(is-bin-program),32)
Expand Down