MacOSX support #1419
MacOSX support #1419
Conversation
|
Can one of the admins verify this patch? |
| @@ -10,7 +11,7 @@ BASE_FLAGS="-fPIC -O3 -g" | |||
|
|
|||
| PLATFORM=$(uname -s) | |||
| if [ "$PLATFORM" == "Darwin" ]; then | |||
| C_FLAGS="$BASE_FLAGS -mmacosx-version-min=10.7 -arch i386" | |||
| C_FLAGS="$BASE_FLAGS -mmacosx-version-min=10.7 -arch x86_64" | |||
There was a problem hiding this comment.
this is the only line in this file that is strictly necessary to fix for MacOSX -- all the rest of the diff in install_deps.sh here i just found more useful, but it could all be dropped.
There was a problem hiding this comment.
The other changes look good to me too.
generate_version_translation_unit.sh
Outdated
| PLATFORM=$(uname -s) | ||
| if [ "$PLATFORM" == "Darwin" ]; then | ||
| echo -e "$VERSION_TEMPLATE" | | ||
| sed "s/%%DATE%%/`date -j -u -f \"%Y-%m-%d %H:%M:%S %z\" \"$(git log -1 --format=%cd --date=iso)\"`/" | |
There was a problem hiding this comment.
mac date doesn't have nice iso format flags, so it has to get done manually here
There was a problem hiding this comment.
The format seems inconsistent with the the one we are using, which is really ISO 8601 extended format, that is %Y-%m-%dT%H:%M:%SZ; note the T, and note the timezone written simply as Z (with no space) since we give UTC.
Example in our Catalan build:
char const BuildDate[] = "2017-05-26T12:44:02Z";There was a problem hiding this comment.
So that string is what parses the git log output and its right because --date=iso gives that. The problem is that it needs the proper format string for output, which I appear to have dropped
|
Looks good, as you said the Makefile changes need to be made conditional. |
|
accidentally dropped the output formatting Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
soothes dry damaged and brittle makefile code. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
|
Tests pass on linux when merging this, so LGTM. |
WIP WIP WIP WIP WIP
馃毀 DO NOT MERGE 馃毀
some of the patches to the Makefile need to be made conditional or they'll most likely break Linux builds as well.