Changeset 4dcaed2 for libcfa/src

Timestamp:

Aug 5, 2018, 1:13:35 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

37fe352

Parents:

534e4e4

Message:

Added prelude-dir argument for cfa-cpp

Location:

libcfa/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)

libcfa/src/Makefile.am

@@ -28 +28 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -imacros prelude.c -I$(srcdir)/stdhdr
+AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr
 AM_CFLAGS = -g -Wall -Wno-unused-function
 CFACC = @CFACC@
@@ -43 +43 @@
 
 # not all platforms support concurrency, add option do disable it
-libsrc += concurrency/CtxSwitch-@host_alias@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
+libsrc += concurrency/CtxSwitch-@host_cpu@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing

libcfa/src/Makefile.in

@@ -151 +151 @@
         interpose.$(OBJEXT) bits/debug.$(OBJEXT) assert.$(OBJEXT) \
         exception.$(OBJEXT) virtual.$(OBJEXT) heap.$(OBJEXT) \
-        $(am__objects_1) concurrency/CtxSwitch-@host_alias@.$(OBJEXT) \
+        $(am__objects_1) concurrency/CtxSwitch-@host_cpu@.$(OBJEXT) \
         concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \
         concurrency/preemption.$(OBJEXT)
@@ -344 +344 @@
 # use -no-include-stdhdr to prevent rebuild cycles
 # The built sources must not depend on the installed headers
-AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -imacros prelude.c -I$(srcdir)/stdhdr
+AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr
 AM_CFLAGS = -g -Wall -Wno-unused-function
 
@@ -357 +357 @@
 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
         exception.c virtual.c heap.cfa ${headers:=.cfa} \
-        concurrency/CtxSwitch-@host_alias@.S concurrency/alarm.cfa \
+        concurrency/CtxSwitch-@host_cpu@.S concurrency/alarm.cfa \
         concurrency/invoke.c concurrency/preemption.cfa
 libcfa_a_SOURCES = ${libsrc}
@@ -479 +479 @@
 concurrency/mutex.$(OBJEXT): concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/CtxSwitch-@host_alias@.$(OBJEXT):  \
+concurrency/CtxSwitch-@host_cpu@.$(OBJEXT):  \
         concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
@@ -506 +506 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@host_alias@.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@host_cpu@.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@