Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
2ac26dc8
Kaydet (Commit)
2ac26dc8
authored
Ara 11, 2012
tarafından
Luboš Luňák
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
adjust clang plugins for srcdir != builddir
Change-Id: Ie4c934b52c4b010703e91f84b83e1fe590b5d187
üst
c8c056fd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Makefile-clang.mk
compilerplugins/Makefile-clang.mk
+2
-2
com_GCC_defs.mk
solenv/gbuild/platform/com_GCC_defs.mk
+2
-2
No files found.
compilerplugins/Makefile-clang.mk
Dosyayı görüntüle @
2ac26dc8
...
@@ -37,7 +37,7 @@ CLANGINCLUDES=-I$(CLANGDIR)/include -I$(CLANGDIR)/tools/clang/include -I$(CLANGB
...
@@ -37,7 +37,7 @@ CLANGINCLUDES=-I$(CLANGDIR)/include -I$(CLANGDIR)/tools/clang/include -I$(CLANGB
CLANGINDIR=$(SRCDIR)/compilerplugins/clang
CLANGINDIR=$(SRCDIR)/compilerplugins/clang
# Cannot use $(WORKDIR), the plugin should survive even 'make clean', otherwise the rebuilt
# Cannot use $(WORKDIR), the plugin should survive even 'make clean', otherwise the rebuilt
# plugin will cause cache misses with ccache.
# plugin will cause cache misses with ccache.
CLANGOUTDIR=$(
SRC
DIR)/compilerplugins/obj
CLANGOUTDIR=$(
BUILD
DIR)/compilerplugins/obj
compilerplugins: $(CLANGOUTDIR) $(CLANGOUTDIR)/plugin.so
compilerplugins: $(CLANGOUTDIR) $(CLANGOUTDIR)/plugin.so
...
@@ -63,7 +63,7 @@ endef
...
@@ -63,7 +63,7 @@ endef
$(foreach src, $(CLANGSRC), $(eval $(call clangbuildsrc,$(src),$(CLANGINDIR)/$(src),$(CLANGOUTDIR)/$(src:.cxx=.o))))
$(foreach src, $(CLANGSRC), $(eval $(call clangbuildsrc,$(src),$(CLANGINDIR)/$(src),$(CLANGOUTDIR)/$(src:.cxx=.o))))
$(CLANGOUTDIR)/plugin.so: $(CLANGOBJS)
$(CLANGOUTDIR)/plugin.so: $(CLANGOBJS)
@echo [build LNK] $(subst $(
SRC
DIR)/,,$@)
@echo [build LNK] $(subst $(
BUILD
DIR)/,,$@)
$(CXX) -shared $(CLANGOBJS) -o $@
$(CXX) -shared $(CLANGOBJS) -o $@
# Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes.
# Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes.
...
...
solenv/gbuild/platform/com_GCC_defs.mk
Dosyayı görüntüle @
2ac26dc8
...
@@ -161,9 +161,9 @@ gb_LinkTarget_INCLUDE :=\
...
@@ -161,9 +161,9 @@ gb_LinkTarget_INCLUDE :=\
ifeq ($(COM_GCC_IS_CLANG),TRUE)
ifeq ($(COM_GCC_IS_CLANG),TRUE)
ifeq ($(COMPILER_PLUGIN_TOOL),)
ifeq ($(COMPILER_PLUGIN_TOOL),)
gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(
SRC
DIR)/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin
gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(
BUILD
DIR)/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin
else
else
gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(
SRC
DIR)/compilerplugins/obj/plugin.so -Xclang -plugin -Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang $(COMPILER_PLUGIN_TOOL)
gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(
BUILD
DIR)/compilerplugins/obj/plugin.so -Xclang -plugin -Xclang loplugin -Xclang -plugin-arg-loplugin -Xclang $(COMPILER_PLUGIN_TOOL)
endif
endif
# extra EF variable to make the command line shorter (just like is done with $(SRCDIR) etc.)
# extra EF variable to make the command line shorter (just like is done with $(SRCDIR) etc.)
gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/sal/inc/sal/log-areas.dox && ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF
gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/sal/inc/sal/log-areas.dox && ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment