From 14000a9c8834b3d3f92d9c01c489024d2062b5d5 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Mon, 16 Mar 2015 14:25:41 -0400 Subject: Fixed CFLAGS and CXXFLAGS passing for automated x86_64 builds; src/Makefile --- src/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 9db6b914..62ceb493 100644 --- a/src/Makefile +++ b/src/Makefile @@ -315,9 +315,9 @@ release: $(basedir).i386 $(basedir).x86_64: ; hg archive $@ -X ".hg*" release64: $(basedir).x86_64 make clean libluajit64 - PKG_CONFIG_PATH=/opt/gtk64/lib/pkgconfig make -j4 CFLAGS=-m64 \ - CXXFLAGS=-m64 || return 0 - make -j4 CFLAGS=-m64 CXXFLAGS=-m64 \ + PKG_CONFIG_PATH=/opt/gtk64/lib/pkgconfig make -j4 CFLAGS='$(CFLAGS) -m64' \ + CXXFLAGS='$(CXXFLAGS) -m64' || return 0 + make -j4 CFLAGS='$(CFLAGS) -m64' CXXFLAGS='$(CXXFLAGS) -m64' \ CURSES_CFLAGS=-I/opt/ncursesw64/include/ncursesw \ CURSES_LIBS="-L/opt/ncursesw64/lib -lncursesw" curses || return 0 cp -r ../doc ../lexers ../textadept* $< -- cgit v1.2.3