diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-04-15 09:55:21 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-04-15 09:55:21 +0000 |
| commit | 45855d3af69e5ecff7cb27132abbfa5a417727dc (patch) | |
| tree | 7e2e82435eb7f678e28a5c40eaed9aea97635f48 /include | |
| parent | 6cb0faf3d98ccdd80247d94cb295e384d800cff9 (diff) | |
| download | ATCD-45855d3af69e5ecff7cb27132abbfa5a417727dc.tar.gz | |
ChangeLogTag: Thu Apr 15 09:51:32 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_g++_common.GNU | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU index fad2b275ea9..78cb5809e5b 100644 --- a/include/makeinclude/platform_g++_common.GNU +++ b/include/makeinclude/platform_g++_common.GNU @@ -77,8 +77,12 @@ ifneq ($(DLD),) else LD_FOR_VERSION_TEST = $(DLD) endif # DLD = CXX_FOR_VERSION_TEST - # The -E option is GNU ld specific - GNU_LD := $(shell sh -c '$(LD_FOR_VERSION_TEST) -v 2>&1 | grep -c "GNU ld"') + # The -E option is GNU ld specific + ifneq ($(mingw32),1) + GNU_LD := $(shell sh -c '$(LD_FOR_VERSION_TEST) -v 2>&1 | grep -c "GNU ld"') + else + GNU_LD := $(shell $(LD_FOR_VERSION_TEST) -v | grep -c 'GNU ld') + endif # mingw32 endif # DLD ifeq ($(GNU_LD),1) @@ -91,7 +95,16 @@ ifeq ($(shared_libs), 1) ifneq ($(static_libs_only), 1) ifeq ($(GNU_LD),1) # Make sure this version of ld supports the -E option. - LD_EXPORT_DEFINED := $(shell sh -c '$(LD_FOR_VERSION_TEST) -E 2>&1 | grep -i -e "option" -e "flag" /dev/null; echo $$?') + ifneq ($(mingw32),1) + LD_EXPORT_DEFINED := $(shell sh -c '$(LD_FOR_VERSION_TEST) -E 2>&1 | grep -i -e "option" -e "flag" /dev/null; echo $$?') + else + LD_EXPORT_DEFINED := $(shell $(LD_FOR_VERSION_TEST) -E 2>&1 | grep -c -i -e '(option|flag)') + ifeq ($(LD_EXPORT_DEFINED),0) + LD_EXPORT_DEFINED:=1 + else + LD_EXPORT_DEFINED:=0 + endif + endif # mingw32 ifeq ($(LD_EXPORT_DEFINED),1) LDFLAGS += -Wl,-E endif # LD_EXPORT_DEFINED = 1 |