diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-07-01 20:13:37 +0200 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-08-11 08:40:52 -0500 |
| commit | b4a97f95f3d840f2d6864f5307d3d99a76c9028e (patch) | |
| tree | 6632618b2e1f4e270f5abccb0202340a7ae36f70 | |
| parent | eb32126b750d7ce4aa9221023fdd874ffac37a53 (diff) | |
| download | ATCD-b4a97f95f3d840f2d6864f5307d3d99a76c9028e.tar.gz | |
Merge pull request #1874 from jwillemsen/jwi-ctdtcompile
ctdt is a c file, so compile as c file, not c++
(cherry picked from commit eafca4ec3ad0f1f4d9e80737a0ac25c6184d8b85)
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks7.0.GNU | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU index 3a698197aaf..5d930edb45d 100644 --- a/ACE/include/makeinclude/platform_vxworks7.0.GNU +++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU @@ -22,7 +22,6 @@ # Not all configurations supported on VxWorks 6.x have been brought forward # to this file. If you are building a configuration that has not yet been # attempted on VxWorks 7, this file may need to be changed. - VXWORKS = 1 CROSS-COMPILE = 1 @@ -92,7 +91,7 @@ ifeq ($(rtp),0) define LINK.cc.override $(LD) -r -nostdlib $(LDFLAGS) -o $(call IFILE,$@)_partial.o $(filter %.o,$^) $(DKM_LIBS) $(NM) $(call IFILE,$@)_partial.o | $(MUNCH) > $(call IFILE,$@)_ctdt.c - $(COMPILE.cc) -o $(call IFILE,$@)_ctdt.o $(call IFILE,$@)_ctdt.c + $(COMPILE.c) -o $(call IFILE,$@)_ctdt.o $(call IFILE,$@)_ctdt.c $(LD) -r -nostdlib -X $(LD_SCRIPT_DOWNLOAD) -o $@ $(call IFILE,$@)_ctdt.o $(call IFILE,$@)_partial.o $(DKM_FINAL_LIBS) endef |