From aab7c92afc4533a07bf3f8295f5c6bcfab03ff48 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 27 Aug 2009 16:37:37 +0000 Subject: [PATCH] 2009-08-27 18:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/bsd/gcc.mk * config/hpux/gcc.mk * config/linux/gcc.mk * config/linux/icc.mk * config/sunos/gcc.mk * Changed to use different method to pass object file list to gcc. Previous method (@) only works in 4.x (?) gcc versions. --- harbour/ChangeLog | 9 +++++++++ harbour/config/bsd/gcc.mk | 4 ++-- harbour/config/hpux/gcc.mk | 4 ++-- harbour/config/linux/gcc.mk | 4 ++-- harbour/config/linux/icc.mk | 4 ++-- harbour/config/sunos/gcc.mk | 4 ++-- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 70eb5b0fa9..f44a845260 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-27 18:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/bsd/gcc.mk + * config/hpux/gcc.mk + * config/linux/gcc.mk + * config/linux/icc.mk + * config/sunos/gcc.mk + * Changed to use different method to pass object file list to gcc. + Previous method (@) only works in 4.x (?) gcc versions. + 2009-08-27 18:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/linux/sunpro.mk + Setting CXX for linux/sunpro.mk to make it build .cpp files diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk index 61a6b15ebb..15fe1292aa 100644 --- a/harbour/config/bsd/gcc.mk +++ b/harbour/config/bsd/gcc.mk @@ -51,13 +51,13 @@ DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dyn_object - @$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __dyn__.tmp + @$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk index 277672818f..fcb407d08a 100644 --- a/harbour/config/hpux/gcc.mk +++ b/harbour/config/hpux/gcc.mk @@ -57,13 +57,13 @@ DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dyn_object - @$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __dyn__.tmp + @$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk index d21ffc2694..18bb4ff3b1 100644 --- a/harbour/config/linux/gcc.mk +++ b/harbour/config/linux/gcc.mk @@ -55,13 +55,13 @@ DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dyn_object - @$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __dyn__.tmp + @$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/linux/icc.mk b/harbour/config/linux/icc.mk index 3108e2fe80..36453b822a 100644 --- a/harbour/config/linux/icc.mk +++ b/harbour/config/linux/icc.mk @@ -60,13 +60,13 @@ DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dyn_object - @$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __dyn__.tmp + @$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk index 689fd83377..449b9fea7d 100644 --- a/harbour/config/sunos/gcc.mk +++ b/harbour/config/sunos/gcc.mk @@ -55,13 +55,13 @@ DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib)) # NOTE: The empty line directly before 'endef' HAVE TO exist! define dyn_object - @$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __dyn__.tmp + @$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dyn_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ @__dyn__.tmp $(DLIBS) + $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) endef DY_RULE = $(create_dynlib)