diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-31 16:34:05 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-31 16:34:05 +0000 |
| commit | ede689a4199e6b2befb9c6ffb533f549bceca56c (patch) | |
| tree | e07547a8a11d091e079244362032dd14f1a46fc7 /debian | |
| parent | 4c6b72d32ce1fe97941a7e018502ef37185081f2 (diff) | |
| download | gcc-5-ede689a4199e6b2befb9c6ffb533f549bceca56c.tar.gz | |
* Rebuild the work around to build libgccjit on arm64.
* Fix the libgccjit build using the just built compiler.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7938 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/rules2 | 28 |
2 files changed, 17 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 14fbfce..eed15f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ gcc-5 (5-20150329-2) UNRELEASED; urgency=medium path names at runtime. * Don't link libgnatprj using --no-allow-shlib-undefined on older releases. * Don't build libmpx on older releases. + * Rebuild the work around to build libgccjit on arm64. + * Fix the libgccjit build using the just built compiler. -- Matthias Klose <doko@ubuntu.com> Tue, 31 Mar 2015 14:40:11 +0200 diff --git a/debian/rules2 b/debian/rules2 index ca59cdd..7081bfb 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -1222,29 +1222,31 @@ CONFARGS_JIT := \ --enable-languages=jit \ --enable-host-shared -# see Linaro#1149 -ifeq (,$(filter $(DEB_TARGET_ARCH),arm64)) - CONFARGS_JIT := \ +CONFARGS_JIT := \ $(filter-out %bootstrap, $(CONFARGS_JIT)) \ --disable-bootstrap -endif -# FIXME: this doesn't yet work, use the system g++ for the builds -CC_FOR_JIT = $(builddir)/gcc/xg++ -B$(builddir)/gcc/ \ +ifeq ($(DEB_CROSS),yes) + CC_FOR_JIT = $(CC) + CXX_FOR_JIT = $(CXX) +else + CC_FOR_JIT = $(builddir)/gcc/xgcc -B$(builddir)/gcc/ + CXX_FOR_JIT = $(builddir)/gcc/xg++ -B$(builddir)/gcc/ \ + -B$(builddir)/$(TARGET_ALIAS)/libstdc++-v3/src/.libs \ + -B$(builddir)/$(TARGET_ALIAS)/libstdc++-v3/libsupc++/.libs \ -I$(builddir)/$(TARGET_ALIAS)/libstdc++-v3/include \ - -I$(builddir)/$(TARGET_ALIAS)/libstdc++-v3/include/$(TARGET_ALIAS) -CC_FOR_JIT = + -I$(builddir)/$(TARGET_ALIAS)/libstdc++-v3/include/$(TARGET_ALIAS) \ + -I$(srcdir)/libstdc++-v3/libsupc++ \ + -L$(builddir)/$(TARGET_ALIAS)/libstdc++-v3/src/.libs \ + -L$(builddir)/$(TARGET_ALIAS)/libstdc++-v3/libsupc++/.libs +endif $(configure_jit_stamp): $(build_stamp) dh_testdir rm -f $(configure_jit_stamp) $(build_jit_stamp) rm -rf $(builddir_jit) mkdir $(builddir_jit) -ifeq (0,1) - : # FIXME: or set -B and LD_LIBRARY_PATH ??? - cp -a $(builddir)/$(TARGET_ALIAS)/libstdc++-v3/src/.libs/libstdc++.{a,so*} \ - $(builddir)/gcc/. -endif + : # configure cd $(builddir_jit) && \ $(SET_PATH) \ |