diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2017-02-07 16:32:02 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2017-02-07 16:32:02 +0000 |
| commit | 270a2e7a04af3b944b6b7ffe561ffa7eaa1cdd8f (patch) | |
| tree | e668ada56ed458afd14864fffe31c9e40ae33b51 /graphite | |
| parent | 5642df3f3e6c764dc5723749b65f9407658225f2 (diff) | |
Add initial support for building AOO with Clang on Linux.
This allows Ubuntu 16.04 to compile AOO with Clang 1.8 on an x86.
Other architectures probably don't work, as Clang 1.8 is pretty
strict about the low-level C++ ABI hacks in main/bridges, but at
least they should fail early in main/bridges instead of the
previous behaviour, where main/bridges compiles nothing when
"$(COM)" != "GCC" and main/i18npool then fails with a mysterious
"error: cannot get uno environments" message.
Patch by: me
Notes
Notes:
prefer: bf1f0183d5c6b4c94acdbee27276d5a386a657f4
Diffstat (limited to 'graphite')
| -rw-r--r-- | graphite/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphite/makefile.mk b/graphite/makefile.mk index a55ff377c61b..1cfcb46fc4d3 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -92,7 +92,7 @@ CFLAGS4MSC= $(CFLAGS2MSC:s/ -/ $(JUSTASLASH)/) BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll .ENDIF -.IF "$(COM)"=="GCC" || "$(OS)"=="FREEBSD" +.IF "$(COM)"=="GCC" || "$(COM)"=="CLANG" # Does linux want --disable-shared? .IF "x$(debug)"!="x" @@ -137,7 +137,7 @@ OUT2LIB=engine$/release$/*.lib OUT2LIB=engine$/src$/.libs$/libgraphite*.a .ENDIF -.IF "$(COM)"=="GCC" || "$(OS)"=="FREEBSD" +.IF "$(COM)"=="GCC" || "$(COM)"=="CLANG" BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) .ENDIF |