diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:14 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:14 +0200 |
| commit | 75068ecaa17c9724feb06f9b8ee12ac29012beda (patch) | |
| tree | 63ca4dfc3d33f814c4ad27718c0756762b54e2d7 /tools | |
| parent | 941020379b1ea1ec7c564c21e68ea1674cda7683 (diff) | |
gnumake4: fix buildbreakers from merge
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Package_reversemap.mk | 2 | ||||
| -rw-r--r-- | tools/StaticLibrary_toolshelpers.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk index ae739de09294..9abc71ba4122 100644 --- a/tools/Package_reversemap.mk +++ b/tools/Package_reversemap.mk @@ -24,7 +24,7 @@ # instead of those above. $(eval $(call gb_Package_Package,tools_reversemap,$(WORKDIR)/CustomTarget/tools/source/reversemap)) -$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap)) +$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap,SRCDIR)) $(eval $(call gb_CustomTarget_add_outdir_dependencies,tools/source/reversemap,\ $(call gb_Executable_get_target_for_build,bestreversemap) \ diff --git a/tools/StaticLibrary_toolshelpers.mk b/tools/StaticLibrary_toolshelpers.mk index a63ac47a7eac..f8e306aab99d 100644 --- a/tools/StaticLibrary_toolshelpers.mk +++ b/tools/StaticLibrary_toolshelpers.mk @@ -34,8 +34,7 @@ $(eval $(call gb_StaticLibrary_set_include,toolshelpers,\ -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) -$(eval $(call gb_StaticLibrary_set_cxxflags,toolshelpers,\ - $$(CXXFLAGS) \ +$(eval $(call gb_StaticLibrary_add_cxxflags,toolshelpers,\ -D_TOOLS_STRINGLIST \ )) |