summarylogtreecommitdiffstats
path: root/Makefile.Arch
diff options
context:
space:
mode:
authorJoey Dumont2017-08-02 13:42:48 -0400
committerJoey Dumont2017-08-02 13:42:48 -0400
commit516f58b1206c3c12cd6b98932631230375588ac4 (patch)
tree41eaa20d4f1eb1d53b15859ddf22ecd71aa0aa2d /Makefile.Arch
parent1215c78969d3cded4dfe255a60fb2dc3e4d78331 (diff)
downloadaur-516f58b1206c3c12cd6b98932631230375588ac4.tar.gz
Switched to depend on gcc6.
Diffstat (limited to 'Makefile.Arch')
-rw-r--r--Makefile.Arch15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.Arch b/Makefile.Arch
index b5fb6299d819..35481354de21 100644
--- a/Makefile.Arch
+++ b/Makefile.Arch
@@ -1,19 +1,20 @@
# Based on 'Makefile.Debian', part of pdftk
# Copyright (c) 2004-2012 Sid Steward
-export CXX= g++-6.3
-export GCJ= gcj-6.3
-export GIJ= gij-6.3
-export GCJH= gcjh-6.3
-export GJAR= gjar-6.3
-export CC1PLUS= cc1plus-6.3
+export CXX= g++-6
+export GCJ= gcj-6
+export GIJ= gij-6
+export GCJH= gcjh-6
+export GJAR= gjar-6
+export CC1PLUS= cc1plus-6
export LIBGCJ= /usr/share/java/libgcj.jar
export AR= ar
export RM= rm
export ARFLAGS= rs
export RMFLAGS= -vf
export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers -fPIC
-export CXXFLAGS= -O2 -fPIC -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include/c++/ -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include/c++/x86_64-pc-linux-gnu
+GCC6VER=`gcc -dumpversion`
+export CXXFLAGS= -O2 -fPIC -I/usr/lib/gcc/x86_64-pc-linux-gnu/${GCC6VER}/include/c++/ -I/usr/lib/gcc/x86_64-pc-linux-gnu/${GCC6VER}/include/c++/x86_64-pc-linux-gnu
export GCJFLAGS= -Wno-all -fsource=1.3 -O2 -fPIC
export GCJHFLAGS= -force
export LDLIBS= -lgcj