summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-02-19 10:04:59 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-02-19 10:05:23 +0100
commit3708fe8434ad6f64d527215f4619556b0a5701ff (patch)
tree3b41467fd75fee3fa5d331f0cfcc2449fc157f8d /external
parentd7f9b7693968f2e2ff7a8d15830a5633d5999ee0 (diff)
Kill the --without-system-stdlibs option
Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f
Diffstat (limited to 'external')
-rw-r--r--external/CustomTarget_stdlibs.mk21
-rw-r--r--external/Module_external.mk10
-rw-r--r--external/Package_stdlibs.mk17
3 files changed, 0 insertions, 48 deletions
diff --git a/external/CustomTarget_stdlibs.mk b/external/CustomTarget_stdlibs.mk
deleted file mode 100644
index 786cb152b93c..000000000000
--- a/external/CustomTarget_stdlibs.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,external/stdlibs))
-
-$(eval $(call gb_CustomTarget_register_targets,external/stdlibs,\
- libgcc_s.so.$(gb_SHORTSTDC3) \
- libstdc++.so.$(gb_SHORTSTDCPP3) \
-))
-
-$(call gb_CustomTarget_get_workdir,external/stdlibs)/lib%:
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),STL,1)
- $(PERL) -w $(SOLARENV)/bin/gccinstlib.pl $(notdir $@) $(dir $@)
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 757c06bcbca2..c5a312abd5a7 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -30,16 +30,6 @@ $(eval $(call gb_Module_add_targets,external,\
))
endif
-ifeq ($(SYSTEM_STDLIBS),NO)
-ifeq ($(gb_CPPU_ENV),gcc3)
-$(eval $(call gb_Module_add_targets,external,\
- CustomTarget_stdlibs \
- Package_stdlibs \
-))
-endif
-endif
-
-
ifeq ($(HAVE_GETOPT),NO)
$(eval $(call gb_Module_add_targets,external,\
UnpackedTarball_glibc \
diff --git a/external/Package_stdlibs.mk b/external/Package_stdlibs.mk
deleted file mode 100644
index 2a074b5b43a6..000000000000
--- a/external/Package_stdlibs.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,stdlibs,$(call gb_CustomTarget_get_workdir,external/stdlibs)))
-
-$(eval $(call gb_Package_add_files,stdlibs,lib, \
- libgcc_s.so.$(gb_SHORTSTDC3) \
- libstdc++.so.$(gb_SHORTSTDCPP3) \
-))
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab: