From c68f372e5a55301850717ab771e52fa30222099e Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Mon, 3 Dec 2018 16:22:57 -0800 Subject: [PATCH] fix wrong copy-pasta in 36e412df Set the CPPFLAGS/CFLAGS/CXXFLAGS/OBJCXXFLAGS variables correctly in build_dist(), were set incorrectly in 36e412df. --- tools/builder/core.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/builder/core.sh b/tools/builder/core.sh index 2dd1e90b..8fda0c75 100644 --- a/tools/builder/core.sh +++ b/tools/builder/core.sh @@ -1348,10 +1348,10 @@ build_dist() { export LDFLAGS="$CXXFLAGS $LDFLAGS" fi - export CPPFLAGS="$LDFLAGS $(eval puts "$(dist_extra_cppflags "$current_dist")")" - export CFLAGS="$LDFLAGS $(eval puts "$(dist_extra_cflags "$current_dist")")" - export CXXFLAGS="$LDFLAGS $(eval puts "$(dist_extra_cxxflags "$current_dist")")" - export OBJCXXFLAGS="$LDFLAGS $(eval puts "$(dist_extra_objcxxflags "$current_dist")")" + export CPPFLAGS="$CPPFLAGS $(eval puts "$(dist_extra_cppflags "$current_dist")")" + export CFLAGS="$CFLAGS $(eval puts "$(dist_extra_cflags "$current_dist")")" + export CXXFLAGS="$CXXFLAGS $(eval puts "$(dist_extra_cxxflags "$current_dist")")" + export OBJCXXFLAGS="$OBJCXXFLAGS $(eval puts "$(dist_extra_objcxxflags "$current_dist")")" export LDFLAGS="$LDFLAGS $(eval puts "$(dist_extra_ldflags "$current_dist")")" export LIBS="$LIBS $(eval puts "$(dist_extra_libs "$current_dist")")"