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

Clang 3.8 adjustments

Browse Source 
... and while I am already there also update the copyright years
This commit is contained in:
Thomas Pöchtrager 2016-02-27 09:40:10 +01:00
parent 2bbed19dfa
commit f51b758db4
16 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_compiler_rt.sh
View File

@ -56,8 +56,9 @@ case $CLANG_VERSION in
3.5*) BRANCH=release_35 ;; 3.5*) BRANCH=release_35 ;;
3.6*) BRANCH=release_36 ;; 3.6*) BRANCH=release_36 ;;
3.7*) BRANCH=release_37 ;; 3.7*) BRANCH=release_37 ;;
3.8*) BRANCH=master ;; 3.8*) BRANCH=release_38 ;;
* ) echo "Unsupported Clang version, must be >= 3.2 and <= 3.8" 1>&2; exit 1; 3.9*) BRANCH=master ;;
* ) echo "Unsupported Clang version, must be >= 3.2 and <= 3.9" 1>&2; exit 1;
esac esac
pushd $OSXCROSS_BUILD_DIR &>/dev/null pushd $OSXCROSS_BUILD_DIR &>/dev/null

16
wrapper/main.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *
@ -183,6 +183,16 @@ bool runprog(Target &target, const char *, const char *progname, char **cargs) {
(*prog)(args.size() - 1, args.data(), target); (*prog)(args.size() - 1, args.data(), target);
} }
bool colordiagnostics(Target &target, const char *opt, const char *, char **) {
target.colordiagnostics = !strcmp(opt, "-fcolor-diagnostics");
return true;
}
bool liblto(Target &target, const char *opt, const char *, char **) {
target.wliblto = !strcmp(opt, "-Wliblto");
return true;
}
bool checkincludepath(Target &, const char *opt, const char *path, char **) { bool checkincludepath(Target &, const char *opt, const char *path, char **) {
#ifndef __APPLE__ #ifndef __APPLE__
constexpr const char *DangerousIncludePaths[] = { "/usr/include", constexpr const char *DangerousIncludePaths[] = { "/usr/include",
@ -247,6 +257,10 @@ constexpr struct Opt {
{"-x", language, true, true}, {"-x", language, true, true},
{"-foc-use-gcc-libstdc++", usegcclibstdcxx}, {"-foc-use-gcc-libstdc++", usegcclibstdcxx},
{"-foc-run-prog", runprog, true, false, "="}, // for internal use only {"-foc-run-prog", runprog, true, false, "="}, // for internal use only
{"-fcolor-diagnostics", colordiagnostics, false, true},
{"-fno-color-diagnostics", colordiagnostics, false, true},
{"-Wliblto", liblto, false, true},
{"-Wno-liblto", liblto, false, true},
{"-isystem", checkincludepath, true, true}, {"-isystem", checkincludepath, true, true},
{"-icxx-isystem", checkincludepath, true, true}, {"-icxx-isystem", checkincludepath, true, true},
{"-cxx-isystem", checkincludepath, true, true}, {"-cxx-isystem", checkincludepath, true, true},

2
wrapper/programs/dsymutil.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/programs/osxcross-cmp.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

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

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/programs/osxcross-env.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/programs/osxcross-man.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/programs/osxcross-version.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/programs/pkg-config.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/programs/sw_vers.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/programs/xcrun.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/progs.h
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

23
wrapper/target.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *
@ -43,7 +43,8 @@ namespace target {
Target::Target() Target::Target()
: vendor(getDefaultVendor()), SDK(getenv("OSXCROSS_SDKROOT")), : vendor(getDefaultVendor()), SDK(getenv("OSXCROSS_SDKROOT")),
arch(Arch::x86_64), target(getDefaultTarget()), stdlib(StdLib::unset), arch(Arch::x86_64), target(getDefaultTarget()), stdlib(StdLib::unset),
usegcclibs(), compiler(getDefaultCompilerIdentifier()), usegcclibs(), colordiagnostics(-1), wliblto(-1),
compiler(getDefaultCompilerIdentifier()),
compilername(getDefaultCompilerName()), language() { compilername(getDefaultCompilerName()), language() {
if (!getExecutablePath(execpath, sizeof(execpath))) if (!getExecutablePath(execpath, sizeof(execpath)))
abort(); abort();
@ -785,6 +786,24 @@ bool Target::setup() {
} }
} }
if (clangversion >= ClangVersion(3, 8)) {
//
// Silence:
// warning: libLTO.dylib relative to clang installed dir not found;
// using 'ld' default search path instead
//
// '-flto' will of course work nevertheless, it's just a buggy
// cross-compilation warning.
//
if (wliblto == -1)
fargs.push_back("-Wno-liblto");
//
// Get back color diagnostics.
//
if (colordiagnostics == -1)
fargs.push_back("-fcolor-diagnostics");
}
return true; return true;
} }
} // namespace target } // namespace target

4
wrapper/target.h
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *
@ -138,6 +138,8 @@ struct Target {
ClangVersion clangversion; ClangVersion clangversion;
GCCVersion gccversion; GCCVersion gccversion;
bool usegcclibs; bool usegcclibs;
int colordiagnostics;
int wliblto;
Compiler compiler; Compiler compiler;
std::string compilerpath; // /usr/bin/clang | [...]/target/bin/*-gcc std::string compilerpath; // /usr/bin/clang | [...]/target/bin/*-gcc
std::string compilername; // clang | gcc std::string compilername; // clang | gcc

2
wrapper/tools.cpp
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *

2
wrapper/tools.h
View File

@ -1,6 +1,6 @@
/*********************************************************************** /***********************************************************************
* OSXCross Compiler Wrapper * * OSXCross Compiler Wrapper *
* Copyright (C) 2014, 2015 by Thomas Poechtrager * * Copyright (C) 2014-2016 by Thomas Poechtrager *
* t.poechtrager@gmail.com * * t.poechtrager@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or * * This program is free software; you can redistribute it and/or *