diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-02-04 16:13:58 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-02-04 16:13:58 -0600 |
| commit | 7c1ba7b90306bec2a3479f81d15a51ad8834fd44 (patch) | |
| tree | c182edcb6f86d25b35e977acf72d3a0174d80f13 /ACE/include | |
| parent | c9ac5fecf4621d2e186932a4003890506ce37b58 (diff) | |
| parent | 37ddee2ee7109a5093b360da104116389292acd5 (diff) | |
| download | ATCD-7c1ba7b90306bec2a3479f81d15a51ad8834fd44.tar.gz | |
Merge branch 'igtd/android-on-windows' of github.com:iguessthislldo/ACE_TAO into igtd/android-on-windows
Diffstat (limited to 'ACE/include')
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 24ebf3bb5b4..94b52b16748 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -83,6 +83,9 @@ ifndef CROSS_COMPILE $(error ANDROID_ABI passed (set to: $(ANDROID_ABI)) is not valid) endif +# Export so child processes can use tools from the same toolchain. +export CROSS_COMPILE + ifeq ($(android_force_clang),0) # Determine if the g++ compiler is GCC or Clang. # There are at least 3 assumptions being made here: |