From 00014ec0e849100d4d9220feb067f7cf91b32ee8 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Wed, 24 Jun 2015 11:23:52 +0000 Subject: [PATCH] include headers from top-level rumprun-directory --- app-tools/Makefile.app-tools | 2 +- app-tools/specs-bake.in | 2 +- app-tools/specs-ferment.in | 2 +- app-tools/specs-stub.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-tools/Makefile.app-tools b/app-tools/Makefile.app-tools index d6eb67fcc..cb9a9be57 100644 --- a/app-tools/Makefile.app-tools +++ b/app-tools/Makefile.app-tools @@ -38,7 +38,7 @@ $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-${1}: \ -e 's#!CC!#$(CC)#g;' \ -e 's#!CXX!#$(CXX)#g;' \ -e 's#!ARCH!#$(APP_TOOLS_TARGETARCH)#g;' \ - -e 's#!BASE!#$(abspath .)#g;' \ + -e 's#!BASE!#$(abspath ../..)#g;' \ -e 's#!APPTOOLS!#$(APP_TOOLS_DIR)#g;' \ -e 's#!APPTOOLS_PLATFORM!#$(APP_TOOLS_PLATFORM)#g;' \ -e 's#!CPPFLAGS!#$(BUILDRUMP_TOOL_CPPFLAGS)#g;' \ diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in index ce8d260a2..a54d6705c 100644 --- a/app-tools/specs-bake.in +++ b/app-tools/specs-bake.in @@ -1,7 +1,7 @@ %rename cpp_options old_cpp_options *cpp_options: --nostdinc -isystem !BASE!/rump/include -isystem !BASE!/rump/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ +-nostdinc -isystem !BASE!/rumprun/include -isystem !BASE!/rumprun/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ %rename cc1_options old_cc1_options diff --git a/app-tools/specs-ferment.in b/app-tools/specs-ferment.in index 554ac1b7c..15c80bf86 100644 --- a/app-tools/specs-ferment.in +++ b/app-tools/specs-ferment.in @@ -1,7 +1,7 @@ %rename cpp_options old_cpp_options *cpp_options: --nostdinc -isystem !BASE!/rump/include -isystem !BASE!/rump/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ +-nostdinc -isystem !BASE!/rumprun/include -isystem !BASE!/rumprun/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ %rename cc1_options old_cc1_options diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in index de5a1c662..ccfb3ea6d 100644 --- a/app-tools/specs-stub.in +++ b/app-tools/specs-stub.in @@ -1,7 +1,7 @@ %rename cpp_options old_cpp_options *cpp_options: --nostdinc -isystem !BASE!/rump/include -isystem !BASE!/rump/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ +-nostdinc -isystem !BASE!/rumprun/include -isystem !BASE!/rumprun/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ %rename cc1_options old_cc1_options