diff options
| author | Joe George <joe@zeroc.com> | 2021-03-01 14:22:40 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-03-01 14:22:40 -0500 |
| commit | 323e7c95832d71fad298e69deddf412c347cee87 (patch) | |
| tree | ccc03581b0a5d021f6146743eeca64f5e7cbbeb3 | |
| parent | Fix version string and objc build (diff) | |
| download | ice-323e7c95832d71fad298e69deddf412c347cee87.tar.bz2 ice-323e7c95832d71fad298e69deddf412c347cee87.tar.xz ice-323e7c95832d71fad298e69deddf412c347cee87.zip | |
Make fixes for c++98 dependencies
| -rw-r--r-- | objective-c/Makefile | 1 | ||||
| -rw-r--r-- | objective-c/config/Make.rules | 5 | ||||
| -rw-r--r-- | php/Makefile | 1 | ||||
| -rw-r--r-- | python/Makefile | 1 | ||||
| -rw-r--r-- | ruby/Makefile | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/objective-c/Makefile b/objective-c/Makefile index 6310f19cb5c..bf21308932d 100644 --- a/objective-c/Makefile +++ b/objective-c/Makefile @@ -11,6 +11,7 @@ include $(lang_srcdir)/config/Make.rules # # Load C++ dependencies # +cpp98_projects = % $(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2objc)) $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL IceIAP))) diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules index ffc05d02690..bb33d6b3ee1 100644 --- a/objective-c/config/Make.rules +++ b/objective-c/config/Make.rules @@ -24,11 +24,6 @@ endif $(eval $(call validate-config)) # -# Projects which are built with C++98 -# -cpp98_projects = % - -# # Build only few components with the static configuration (libraries) # static_components = Ice IceSSL IceIAP IceObjC IceSSLObjC IceIAPObjC Glacier2ObjC IceStormObjC IceGridObjC diff --git a/php/Makefile b/php/Makefile index 768564ea4ee..3d34db27b59 100644 --- a/php/Makefile +++ b/php/Makefile @@ -10,6 +10,7 @@ include $(top_srcdir)/config/Make.rules # # Load C++ dependencies # +cpp98_projects = % $(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2php)) $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL IceDiscovery IceLocatorDiscovery))) diff --git a/python/Makefile b/python/Makefile index 835f2694d8d..fe2bc5e7f2e 100644 --- a/python/Makefile +++ b/python/Makefile @@ -14,6 +14,7 @@ include $(top_srcdir)/config/Make.rules # # Load C++ dependencies # +cpp98_projects = % $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL IceLocatorDiscovery IceDiscovery))) # diff --git a/ruby/Makefile b/ruby/Makefile index a3e947be0d5..db5e8a4b1f4 100644 --- a/ruby/Makefile +++ b/ruby/Makefile @@ -10,6 +10,7 @@ include $(top_srcdir)/config/Make.rules # # Load C++ dependencies # +cpp98_projects = % $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/cpp/src/,Ice IceSSL IceLocatorDiscovery IceDiscovery))) $(eval $(call load-translator-dependencies,$(top_srcdir)/cpp/src/slice2rb)) |