diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 6 | ||||
| -rw-r--r-- | test/new.cc | 16 |
2 files changed, 3 insertions, 19 deletions
diff --git a/test/Makefile b/test/Makefile index fdbdc8f..84f573a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,4 +1,4 @@ -TEST_OBJECTS = test_typeinfo.o test.o test_exception.o new.o test_guard.o +TEST_OBJECTS = test_typeinfo.o test.o test_exception.o test_guard.o # This library implements exception handling, so make sure that the compiler # emits the correct code @@ -12,12 +12,12 @@ CXXFLAGS += -Wall -pedantic -g # Find the unwind.h header installed from ports CPPFLAGS += -I/usr/local/include -LDFLAGS += -L/usr/local/lib -L. -lpthread -fexceptions -lcxxabi +LDFLAGS += -L/usr/local/lib -L. -lpthread -fexceptions PRODUCTS = test libcxxabi.so.1 system_test test: $(TEST_OBJECTS) libcxxabi.so library - @gcc $(CPPFLAGS) $(LDFLAGS) -o test $(TEST_OBJECTS) + @gcc $(CPPFLAGS) $(LDFLAGS) -o test $(TEST_OBJECTS) -lcxxabi -ldl library: @cd ../src && $(MAKE) diff --git a/test/new.cc b/test/new.cc deleted file mode 100644 index 73184ea..0000000 --- a/test/new.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include <stdlib.h> - -// Stub (incomplete) implementations to allow testing the library without an -// STL implementation -// -// Note: gcc complains on x86 if this takes a size_t, and on x86-64 if it takes -// an unsigned int. This is just a stub, so it doesn't matter too much. -void *operator new(unsigned int s) -{ - return malloc(s); -} - -void operator delete(void *o) -{ - free(o); -} |