diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2015-06-09 15:53:40 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2015-06-09 15:55:13 +0200 |
| commit | 1a2d9577aa55ace28d51ee3f456081690daabb41 (patch) | |
| tree | 402a35bae94feb4bbe863dd29a52eee592327549 /config | |
| parent | b3af0682179612648bcbf6e61b98bbcf832a2f15 (diff) | |
config: OSX/IOS: Don't error out on unused linker flag arguments
Avoids failing on builds when automake/libtool try to be smart by slapping
CFLAGS (i.e. compilation) on the linking phase.
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin.config | 2 | ||||
| -rw-r--r-- | config/ios.config | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/darwin.config b/config/darwin.config index edd1f678..3322353c 100644 --- a/config/darwin.config +++ b/config/darwin.config @@ -42,7 +42,7 @@ for f in ['CFLAGS', 'CCASFLAGS', 'CXXFLAGS', 'OBJCFLAGS', 'LDFLAGS']: os.environ[f] = os.environ.get(f, '') arch_cflags = '-Wall -g -O2' -arch_ldflags = ' -headerpad_max_install_names -Wl,-headerpad_max_install_names ' +arch_ldflags = ' -headerpad_max_install_names -Wl,-headerpad_max_install_names -Wno-error=unused-command-line-argument ' if target_arch == Architecture.X86_64: arch_cflags += ' -arch x86_64 -m64' diff --git a/config/ios.config b/config/ios.config index fd49c342..b2f52ea4 100644 --- a/config/ios.config +++ b/config/ios.config @@ -52,6 +52,7 @@ else: ccache = use_ccache and 'ccache ' or '' extra_cflags='-Wall -g -Os' +extra_ldflags='-Wno-error=unused-command-line-argument' if target_arch == Architecture.ARM64: arch_cflags = ' -arch arm64 -pipe' host = 'aarch64-apple-darwin10' @@ -98,10 +99,10 @@ os.environ['AS']= 'as' os.environ['GAS']= '%s %s' % ('gas-preprocessor.pl', os.environ['CC']) if ios_platform == 'iPhoneOS': os.environ['CFLAGS'] = '%s -isysroot %s -miphoneos-version-min=%s %s' %(arch_cflags, sysroot, min_version, extra_cflags) - os.environ['LDFLAGS'] = '%s -isysroot %s -miphoneos-version-min=%s -Wl,-iphoneos_version_min,%s -Wl,-undefined,error -Wl,-headerpad_max_install_names' %(arch_cflags, sysroot, min_version, min_version) + os.environ['LDFLAGS'] = '%s -isysroot %s -miphoneos-version-min=%s -Wl,-iphoneos_version_min,%s -Wl,-undefined,error -Wl,-headerpad_max_install_names %s' %(arch_cflags, sysroot, min_version, min_version, extra_ldflags) else: os.environ['CFLAGS'] = '%s -isysroot %s -mios-simulator-version-min=%s %s' %(arch_cflags, sysroot, min_version, extra_cflags) - os.environ['LDFLAGS'] = '%s -isysroot %s -mios-simulator-version-min=%s -Wl,-ios_simulator_version_min,%s -Wl,-undefined,error -Wl,-headerpad_max_install_names' %(arch_cflags, sysroot, min_version, min_version) + os.environ['LDFLAGS'] = '%s -isysroot %s -mios-simulator-version-min=%s -Wl,-ios_simulator_version_min,%s -Wl,-undefined,error -Wl,-headerpad_max_install_names %s' %(arch_cflags, sysroot, min_version, min_version, extra_ldflags) os.environ['OBJCFLAGS'] = os.environ['CFLAGS'] os.environ['OBJLDFLAGS'] = os.environ['LDFLAGS'] os.environ['CPPFLAGS'] = '%s -isysroot %s' % (arch_cflags, sysroot) |