History

libtcc1.a while "configure --enable-cross" build and install libtcc1.a for i386, x86_64 and arm64 (libtcc1.a for x86_64 was not installed on i386)

seyko committed 11 years ago

Commit cfaa1651 parent 3dba9cc2 files · +10 −7Browse files

Unified · Split

2 files
  1. Makefile +9 −6
  2. lib/Makefile +1 −1
Makefile+9−6
@@ -137,12 +137,14 @@ LIBTCC1=libtcc1.a · 136 unmodified lines
137137 else ifeq ($(ARCH),i386)
138138 NATIVE_FILES=$(I386_FILES)
139139 PROGS_CROSS=$($(X64_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
140−LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/x86_64/libtcc1.a
140+LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a \
141+ lib/arm64/libtcc1.a
141142 LIBTCC1=libtcc1.a
142143 else ifeq ($(ARCH),x86-64)
143144 NATIVE_FILES=$(X86_64_FILES)
144145 PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
145−LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a
146+LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a \
147+ lib/arm64/libtcc1.a
146148 LIBTCC1=libtcc1.a
147149 else ifeq ($(ARCH),arm)
148150 NATIVE_FILES=$(ARM_FILES)
@@ -296,11 +298,12 @@ endif · 147 unmodified lines
296298 ifdef CONFIG_CROSS
297299 mkdir -p "$(tccdir)/win32/lib/32"
298300 mkdir -p "$(tccdir)/win32/lib/64"
299−ifneq ($(ARCH),i386)
300301 mkdir -p "$(tccdir)/i386"
302+ mkdir -p "$(tccdir)/x86_64"
303+ mkdir -p "$(tccdir)/arm64"
304+ $(INSTALL) -m644 lib/arm64/libtcc1.a "$(tccdir)/arm64"
301305 $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"
302− cp -r "$(tccdir)/include" "$(tccdir)/i386"
303−endif
306+ $(INSTALL) -m644 lib/x86_64/libtcc1.a "$(tccdir)/x86_64"
304307 $(INSTALL) -m644 $(top_srcdir)/win32/lib/*.def "$(tccdir)/win32/lib"
305308 $(INSTALL) -m644 lib/i386-win/libtcc1.a "$(tccdir)/win32/lib/32"
306309 $(INSTALL) -m644 lib/x86_64-win/libtcc1.a "$(tccdir)/win32/lib/64"
@@ -366,7 +369,7 @@ export LIBTCC1 · 59 unmodified lines
366369 clean:
367370 rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.so* *.out *.log \
368371 *.exe a.out tags TAGS libtcc_test$(EXESUF) tcc$(EXESUF)
369− -rm -r $(ARCH)
372+ -rm -r $(ARCH) arm64
370373 -rm *-tcc$(EXESUF)
371374 $(MAKE) -C tests $@
372375 ifneq ($(LIBTCC1),)
lib/Makefile+1−1
@@ -125,4 +125,4 @@ $(DIR)/exists : · 124 unmodified lines
125125 @echo $@ > $@
126126
127127 clean :
128− rm -rfv i386-win x86_64-win i386 x86_64
128+ rm -rfv i386-win x86_64-win i386 x86_64 arm64

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t