summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2017-12-19 10:42:40 +0100
committerAndras Timar <andras.timar@collabora.com>2018-03-19 19:04:23 +0100
commitd2e79cfbb188d6402dbcfc7bd71886f6d2252727 (patch)
tree0c51346735a67895eb16ed909ce321e2f90b5d83 /sal
parent1372021878beec8145efa2e41d61a3c83ac3841f (diff)
Don't use -I$(SRCDIR), people have various strange stuff in the SRCDIR.
For me, the build failed because of a file named 'new' ;-) Change-Id: I1816ff16b1b76a833ded2b6f332553b768916cad Reviewed-on: https://gerrit.libreoffice.org/46776 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit fadbccc3176044b3642716f5b388a793165da05a)
Diffstat (limited to 'sal')
-rw-r--r--sal/CppunitTest_sal_rtl.mk1
-rw-r--r--sal/qa/rtl/alloc/rtl_alloc.cxx2
2 files changed, 1 insertions, 2 deletions
diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk
index c4629a2c33db..43533fc5ab1c 100644
--- a/sal/CppunitTest_sal_rtl.mk
+++ b/sal/CppunitTest_sal_rtl.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl,\
$(eval $(call gb_CppunitTest_set_include,sal_rtl,\
-I$(SRCDIR)/sal/qa/inc \
- -I$(SRCDIR) \
$$(INCLUDE) \
))
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 6a4c1648ff53..0e9b7c0f47a8 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -24,7 +24,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
-#include <sal/rtl/strimp.hxx>
+#include "../../../rtl/strimp.hxx"
#include <memory.h>