diff options
| author | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
| commit | 99855eefd7419c24e9b204fb851ec95adc581b4e (patch) | |
| tree | 0d79a68449d770c3c550b43121c0d6d43f602d14 /cpp/config | |
| parent | Allow java libraries to override pom scm data (diff) | |
| parent | Stack trace test expec files for Linux (diff) | |
| download | ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.bz2 ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.xz ice-99855eefd7419c24e9b204fb851ec95adc581b4e.zip | |
Merge branch '3.6-stretch' into 3.6
Diffstat (limited to 'cpp/config')
| -rw-r--r-- | cpp/config/Make.rules | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index c3170555785..12e73131685 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -183,9 +183,6 @@ else includedir = $(ice_dir)/include endif -# -# Platform specific definitions -# include $(top_srcdir)/config/Make.rules.$(UNAME) install_includedir := $(prefix)/include @@ -278,17 +275,18 @@ ICECPPFLAGS = -I$(slicedir) SLICE2CPPFLAGS = $(ICECPPFLAGS) +LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) + ifeq ($(ice_dir), $(usr_dir)) - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) ifeq ($(CPP11),yes) - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) + LDFLAGS += -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) endif else CPPFLAGS += -I$(includedir) ifdef ice_src_dist - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)$(cpp11libdirsuffix) + LDFLAGS += -L$(libdir)$(cpp11libdirsuffix) else - LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) + LDFLAGS += -L$(ice_dir)/$(libsubdir)$(cpp11libdirsuffix) endif endif |