diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-05-24 13:38:03 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-05-24 13:38:03 +0000 |
| commit | 0d3e8578159a5992cfbed4d6519f5922f5a52058 (patch) | |
| tree | 175bb4d7b958adfe15e2f243742fe20045fcec03 | |
| parent | ae1a16f6fb986126d5ceb34f39cbd5e56ce5f620 (diff) | |
| download | ATCD-0d3e8578159a5992cfbed4d6519f5922f5a52058.tar.gz | |
Thu May 24 13:37:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.2.GNU | 14 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 5fb6dd05fe6..97392405b44 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu May 24 13:37:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_vxworks6.2.GNU: + * include/makeinclude/platform_vxworks6.3.GNU: + The override of RM is only needed for windows + Thu May 24 13:20:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_linux_icc.GNU: diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU index de0271864fc..8338f76245d 100644 --- a/ACE/include/makeinclude/platform_vxworks6.2.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU @@ -52,11 +52,12 @@ ifeq (,$(WIND_HOST_TYPE)) endif # WIND_HOST_TYPE ifeq ("$(WIND_HOST_TYPE)","x86-win32") -ifneq ($(MAKE_MODE), unix) -vxworks_ntbuild ?= 1 -MKDIR_NTSTYLE ?= 1 -lacks_touch ?= 1 -endif + ifneq ($(MAKE_MODE), unix) + vxworks_ntbuild ?= 1 + MKDIR_NTSTYLE ?= 1 + lacks_touch ?= 1 + endif +override RM=rm -f endif HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE) @@ -176,9 +177,6 @@ else include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) endif -## make sure we don't use that stupid, crippled vxrm.bat script. -override RM=rm -f - ifeq ("$(VXWORKSLINK)","true") # prevent possible clash with static LIB rules # in VxWorks make includes and rules.lib.GNU diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index 9b888dd37fc..d56391449a5 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -58,6 +58,7 @@ ifeq ("$(WIND_HOST_TYPE)","x86-win32") ACE_ROOT:=$(subst \,/,$(ACE_ROOT)) TAO_ROOT:=$(subst \,/,$(TAO_ROOT)) CIAO_ROOT:=$(subst \,/,$(CIAO_ROOT)) + override RM=rm -f endif # x86-win32 ifneq (,$(HOST_ROOT)) @@ -223,9 +224,6 @@ else endif endif -## make sure we don't use that stupid, crippled vxrm.bat script. -override RM=rm -f - ifeq ("$(VXWORKSLINK)","true") # prevent possible clash with static LIB rules # in VxWorks make includes and rules.lib.GNU |