Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-03 22:45:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228 from abrodkin/centos7-fix

Browse Source 
Fix building on CentOS 7.x
This commit is contained in:
Thomas Pöchtrager 2020-07-12 16:10:41 +02:00 committed by GitHub
commit 83c2097eba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wrapper/Makefile
View File

@ -9,7 +9,7 @@ LINKER_VERSION ?= 134.9
LIBLTO_PATH ?= LIBLTO_PATH ?=
ADDITIONAL_CXXFLAGS ?= ADDITIONAL_CXXFLAGS ?=
override CXXFLAGS=-std=c++1y -Wall -Wextra -pedantic override CXXFLAGS=-std=c++0x -Wall -Wextra
override CXXFLAGS+=-Wno-missing-field-initializers override CXXFLAGS+=-Wno-missing-field-initializers
override CXXFLAGS+=-I. -O$(OPTIMIZE) override CXXFLAGS+=-I. -O$(OPTIMIZE)

10
wrapper/programs/osxcross-conf.cpp
View File

@ -27,6 +27,12 @@ using namespace target;
namespace program { namespace program {
namespace osxcross { namespace osxcross {
template<typename A>
void print(const char *var, const A &val) {
std::cout << "export OSXCROSS_" << var << "=" << val << std::endl;
};
int conf(Target &target) { int conf(Target &target) {
std::string SDKPath; std::string SDKPath;
OSVersion OSXVersionMin = getDefaultMinTarget(); OSVersion OSXVersionMin = getDefaultMinTarget();
@ -47,10 +53,6 @@ int conf(Target &target) {
if (!ltopath) if (!ltopath)
ltopath = ""; ltopath = "";
auto print = [](const char *var, const auto &val) {
std::cout << "export OSXCROSS_" << var << "=" << val << std::endl;
};
print("VERSION", getOSXCrossVersion()); print("VERSION", getOSXCrossVersion());
print("OSX_VERSION_MIN", OSXVersionMin.shortStr()); print("OSX_VERSION_MIN", OSXVersionMin.shortStr());
print("TARGET", getDefaultTarget()); print("TARGET", getDefaultTarget());