~ubuntu-branches/ubuntu/vivid/speech-tools/vivid-proposed

« back to all changes in this revision

Viewing changes to config/compilers/gcc_defaults.mak

  • Committer: Package Import Robot
  • Author(s): Samuel Thibault, Samuel Thibault, Peter Drysdale
  • Date: 2012-03-26 00:05:28 UTC
  • Revision ID: package-import@ubuntu.com-20120326000528-mw6ekt33at7rdef4
Tags: 1:2.1~release-4
[ Samuel Thibault ]
* control:
  - Bump Standards-Version to 3.9.3 (no changes).
  - Set libestools2.1 multi-arch: same.
* rules: Install libraries to multi-arch path.

[ Peter Drysdale ]
* Add Pre-Depend on multiarch-support as flagged by lintian
* Add qualification to unqualified method calls in templates
  allowing compiling with gcc>=4.7.
* Remove old compiler switch fno-shared-data which is not present
  after gcc>=4.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
81
81
SHARED_LINKFLAGS = 
82
82
 
83
83
ifndef GCC_MAKE_SHARED_LIB
84
 
    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname -Wl,YYY
 
84
    MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY
85
85
else
86
86
    MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
87
87
endif