Browse Source

[1954] Switching to fully compile with C++ to get rid of clang linking errors

Marcin Siodelski 13 years ago
parent
commit
d6f64f5a6b

+ 6 - 1
tests/tools/perfdhcp/Makefile.am

@@ -12,8 +12,13 @@ if USE_STATIC_LINK
 AM_LDFLAGS += -static
 endif
 
+# We have to suppress errors because we are compiling C code with CXX
+# We have to do this to link with new C++ pieces of code
+perfdhcp_CXXFLAGS = $(AM_CXXFLAGS)
+perfdhcp_CXXFLAGS += -Wno-error -Wno-writestrings
+
 pkglibexec_PROGRAMS  = perfdhcp
-perfdhcp_SOURCES  = perfdhcp.c
+perfdhcp_SOURCES  = perfdhcp.cc
 perfdhcp_SOURCES += command_options.cc command_options.h
 
 perfdhcp_LDADD = $(top_builddir)/src/lib/exceptions/libexceptions.la

+ 0 - 2
tests/tools/perfdhcp/command_options.cc

@@ -12,8 +12,6 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#define __STDC_LIMIT_MACROS
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

File diff suppressed because it is too large
+ 3561 - 0
tests/tools/perfdhcp/perfdhcp.cc