← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gcc-snapshot/trusty

« back to all changes in this revision

Viewing changes to debian/rules2

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2013-06-20 15:54:10 UTC
  • mfrom: (135.1.31 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130620155410-17j3phwr0119qzgs
Tags: 20130620-1ubuntu1
Snapshot, taken from the trunk (20130603)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules2
85
85
else
86
86
  CC    = $(if $(filter yes,$(with_ada)),gnatgcc,gcc)
87
87
endif
 
88
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
 
89
  CC_FOR_TARGET = $(builddir)/gcc/xgcc -B$(builddir)/gcc/
 
90
else
 
91
  CC_FOR_TARGET = $(DEB_TARGET_GNU_TYPE)-gcc
 
92
endif
88
93
 
89
94
ifneq ($(distribution),Ubuntu)
90
95
  ifneq (,$(filter $(DEB_TARGET_ARCH), arm armel mips mipsel))
297
302
  else
298
303
    CONFARGS += --with-ecj-jar=$(ecj_jar)
299
304
  endif
 
305
  ifneq ($(with_libgcj),yes)
 
306
    CONFARGS += --disable-libgcj
 
307
  endif
300
308
endif
301
309
 
302
310
ifeq ($(with_gcj),yes)
768
776
usr_libn32 = $(PFL)/lib32
769
777
usr_libx32 = $(PFL)/libx32
770
778
usr_lib64 = $(PFL)/lib64
771
 
# FIXME: Don't hard code
772
 
usr_libhf = $(PFL)/lib/arm-linux-gnueabihf
773
 
usr_libsf = $(PFL)/lib/arm-linux-gnueabi
 
779
# FIXME: Move to the new location for native builds too
 
780
ifeq ($(DEB_CROSS),yes)
 
781
  usr_libhf = $(PFL)/libhf
 
782
  usr_libsf = $(PFL)/libsf
 
783
else
 
784
  usr_libhf = $(PFL)/lib/arm-linux-gnueabihf
 
785
  usr_libsf = $(PFL)/lib/arm-linux-gnueabi
 
786
endif
774
787
 
775
788
gcc_lib_dir32 = $(gcc_lib_dir)/$(biarch32subdir)
776
789
gcc_lib_dirn32 = $(gcc_lib_dir)/$(biarchn32subdir)
777
790
gcc_lib_dirx32 = $(gcc_lib_dir)/$(biarchx32subdir)
778
791
gcc_lib_dir64 = $(gcc_lib_dir)/$(biarch64subdir)
779
 
# FIXME: Don't hard code
780
792
gcc_lib_dirhf = $(gcc_lib_dir)/$(biarchhfsubdir)
781
793
gcc_lib_dirsf = $(gcc_lib_dir)/$(biarchsfsubdir)
782
794
 
787
799
# libx32gcc_s also ends up in usr
788
800
libgcc_dirx32 = $(PFL)/libx32
789
801
libgcc_dir64 = $(RPF)/lib64
790
 
libgcc_dirhf = $(RPF)/lib/arm-linux-gnueabihf
791
 
libgcc_dirsf = $(RPF)/lib/arm-linux-gnueabi
 
802
# FIXME: Move to the new location for native builds too
 
803
ifeq ($(DEB_CROSS),yes)
 
804
  libgcc_dirhf = $(RPF)/libhf
 
805
  libgcc_dirsf = $(RPF)/libsf
 
806
else
 
807
  libgcc_dirhf = $(RPF)/lib/arm-linux-gnueabihf
 
808
  libgcc_dirsf = $(RPF)/lib/arm-linux-gnueabi
 
809
endif
792
810
 
793
811
# install_gcc_lib(lib,soname,flavour,package)
794
812
define install_gcc_lib